Skip to content

Commit

Permalink
Oops missed Makefile.config
Browse files Browse the repository at this point in the history
  • Loading branch information
@sgerraty
sgerraty committed Jul 19, 2020
1 parent cf5cd89 commit e17f5b1
Show file tree
Hide file tree
Showing 9 changed files with 33 additions and 9 deletions.
1 change: 0 additions & 1 deletion lib/libbearssl/Makefile.depend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!

DIRDEPS = \
gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ SUBDIR.${MK_TESTS}+= tests
.if (${LIBC_ARCH} == amd64 || ${LIBC_ARCH} == i386) && \
${.TARGETS:Mall} == all && \
defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mifunc} == ""
.error ${LIBC_ARCH} libc requires linker ifunc support
#.error ${LIBC_ARCH} libc requires linker ifunc support
.endif

.if !defined(_SKIP_BUILD)
Expand Down
6 changes: 5 additions & 1 deletion lib/libsecureboot/local.trust.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@

# force these for Junos
#MANIFEST_SKIP_ALWAYS= boot
MANIFEST_SKIP= boot
XCFLAGS.veopen+= -DMANIFEST_SKIP_MAYBE=\"${MANIFEST_SKIP}\"

VE_HASH_LIST= \
SHA1 \
SHA256 \
Expand Down Expand Up @@ -37,6 +40,7 @@ VE_SIGNATURE_EXT_LIST+= \
VE_SIGNATURE_LIST+= OPENPGP
VE_SIGNATURE_EXT_LIST+= asc

PYTHON ?= /usr/local/bin/python
SIGNER ?= ${SB_TOOLS_PATH:U/volume/buildtools/bin}/sign.py

.if exists(${SIGNER})
Expand Down Expand Up @@ -99,7 +103,7 @@ ta.h: vc_rsa.pem
.endif

# we take the mtime of this as our baseline time
#BUILD_UTC_FILE= ecerts.pem
BUILD_UTC_FILE= ecerts.pem
#VE_DEBUG_LEVEL=3
#VE_VERBOSE_DEFAULT=1

Expand Down
2 changes: 0 additions & 2 deletions libexec/dma/dmagent/Makefile.depend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!

DIRDEPS = \
gnu/lib/csu \
include \
include/arpa \
include/xlocale \
Expand All @@ -11,7 +10,6 @@ DIRDEPS = \
lib/libcompiler_rt \
secure/lib/libcrypto \
secure/lib/libssl \
usr.bin/yacc.host \


.include <dirdeps.mk>
Expand Down
3 changes: 3 additions & 0 deletions libexec/rc/rc.d/tmp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ load_rc_config $name
mount_tmpmfs()
{
if ! /bin/df /tmp | grep -q "^/dev/md[0-9].* /tmp"; then
if test -w /tmp/. && checkyesno tmpmfs_clear_mnt; then
(cd /tmp/. && rm -rf .* *)
fi
mount_md ${tmpsize} /tmp "${tmpmfs_flags}"
chmod 01777 /tmp
fi
Expand Down
2 changes: 1 addition & 1 deletion sbin/veriexec/Makefile.depend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# Autogenerated - do NOT edit!

DIRDEPS = \
gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
Expand All @@ -11,6 +10,7 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libsecureboot \
lib/libveriexec \
usr.bin/yacc.host \


.include <dirdeps.mk>
Expand Down
5 changes: 5 additions & 0 deletions stand/efi/loader/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,8 @@ DPADD= ${LDR_INTERP} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSA} ${LDSCRIPT}
LDADD= ${LDR_INTERP} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSA}

.include <bsd.prog.mk>

PATH_BOOTABLE_TOKEN=/boot/boot.4th
CFLAGS+= ${XCFLAGS.${.TARGET:T:R}:U}
XCFLAGS.main+= -DPATH_BOOTABLE_TOKEN=\"${PATH_BOOTABLE_TOKEN}\"

10 changes: 7 additions & 3 deletions stand/i386/loader/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# $FreeBSD$

.if 0
HAVE_ZFS= ${MK_LOADER_ZFS}

LOADER_NET_SUPPORT?= yes
Expand All @@ -11,6 +11,10 @@ LOADER_MSDOS_SUPPORT?= yes
LOADER_UFS_SUPPORT?= yes
LOADER_GZIP_SUPPORT?= yes
LOADER_BZIP2_SUPPORT?= yes
.else
LOADER_NET_SUPPORT?= yes
LOADER_UFS_SUPPORT?= yes
.endif

.include <bsd.init.mk>

Expand Down Expand Up @@ -56,8 +60,8 @@ LIBI386= ${BOOTOBJ}/i386/libi386/libi386.a
CFLAGS+= -I${BOOTSRC}/i386

# Debug me!
#CFLAGS+= -g
#LDFLAGS+= -g
CFLAGS+= -g
LDFLAGS+= -g

${LOADER}: ${LOADER}.bin ${BTXLDR} ${BTXKERN}
btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \
Expand Down
11 changes: 11 additions & 0 deletions usr.bin/bmake/unit-tests/Makefile.config
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# This is a generated file, do NOT edit!
# See contrib/bmake/bsd.after-import.mk
#
# $FreeBSD$

SRCTOP?= ${.CURDIR:H:H:H}

# $Id: Makefile.config.in,v 1.1 2018/12/30 17:14:24 sjg Exp $

srcdir= ${SRCTOP}/contrib/bmake/unit-tests
DIFF_FLAGS?= -u

0 comments on commit e17f5b1

Please sign in to comment.