diff options
| -rw-r--r-- | lib/libbearssl/Makefile.depend | 1 | ||||
| -rw-r--r-- | lib/libc/Makefile | 2 | ||||
| -rw-r--r-- | lib/libsecureboot/local.trust.mk | 6 | ||||
| -rw-r--r-- | libexec/dma/dmagent/Makefile.depend | 2 | ||||
| -rwxr-xr-x | libexec/rc/rc.d/tmp | 3 | ||||
| -rw-r--r-- | sbin/veriexec/Makefile.depend | 2 | ||||
| -rw-r--r-- | stand/efi/loader/Makefile | 5 | ||||
| -rw-r--r-- | stand/i386/loader/Makefile | 10 |
8 files changed, 9 insertions, 22 deletions
diff --git a/lib/libbearssl/Makefile.depend b/lib/libbearssl/Makefile.depend index 8d409f5263ac..6cfaab1c3644 100644 --- a/lib/libbearssl/Makefile.depend +++ b/lib/libbearssl/Makefile.depend @@ -2,6 +2,7 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 5adc8d71eabb..d5cfe7e50013 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -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) diff --git a/lib/libsecureboot/local.trust.mk b/lib/libsecureboot/local.trust.mk index 77d45f95facd..b28e5ee2d1ef 100644 --- a/lib/libsecureboot/local.trust.mk +++ b/lib/libsecureboot/local.trust.mk @@ -8,9 +8,6 @@ # force these for Junos #MANIFEST_SKIP_ALWAYS= boot -MANIFEST_SKIP= boot -XCFLAGS.veopen+= -DMANIFEST_SKIP_MAYBE=\"${MANIFEST_SKIP}\" - VE_HASH_LIST= \ SHA1 \ SHA256 \ @@ -40,7 +37,6 @@ 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}) @@ -103,7 +99,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 diff --git a/libexec/dma/dmagent/Makefile.depend b/libexec/dma/dmagent/Makefile.depend index 089495a35022..c30f467aa7dc 100644 --- a/libexec/dma/dmagent/Makefile.depend +++ b/libexec/dma/dmagent/Makefile.depend @@ -2,6 +2,7 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + gnu/lib/csu \ include \ include/arpa \ include/xlocale \ @@ -10,6 +11,7 @@ DIRDEPS = \ lib/libcompiler_rt \ secure/lib/libcrypto \ secure/lib/libssl \ + usr.bin/yacc.host \ .include <dirdeps.mk> diff --git a/libexec/rc/rc.d/tmp b/libexec/rc/rc.d/tmp index 56da6b498ad5..3b75ec0338ef 100755 --- a/libexec/rc/rc.d/tmp +++ b/libexec/rc/rc.d/tmp @@ -41,9 +41,6 @@ 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 diff --git a/sbin/veriexec/Makefile.depend b/sbin/veriexec/Makefile.depend index d1b5fac9178d..480d2d2c255e 100644 --- a/sbin/veriexec/Makefile.depend +++ b/sbin/veriexec/Makefile.depend @@ -2,6 +2,7 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + gnu/lib/csu \ include \ include/xlocale \ lib/${CSU_DIR} \ @@ -10,7 +11,6 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libsecureboot \ lib/libveriexec \ - usr.bin/yacc.host \ .include <dirdeps.mk> diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index fe08f5cc4289..73b1975ad3e3 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -102,8 +102,3 @@ 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}\" - diff --git a/stand/i386/loader/Makefile b/stand/i386/loader/Makefile index b46129d5a2dd..b74ef9007d97 100644 --- a/stand/i386/loader/Makefile +++ b/stand/i386/loader/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -.if 0 + HAVE_ZFS= ${MK_LOADER_ZFS} LOADER_NET_SUPPORT?= yes @@ -11,10 +11,6 @@ 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> @@ -60,8 +56,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} \ |