d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert that!

Browse Source
This commit is contained in:
Simon J. Gerraty 2020-07-19 23:56:19 +00:00
parent e17f5b1d30
commit f2be828f97
8 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libbearssl/Makefile.depend
View File

@ -2,6 +2,7 @@
# Autogenerated - do NOT edit! # Autogenerated - do NOT edit!
DIRDEPS = \ DIRDEPS = \
gnu/lib/csu \
include \ include \
include/xlocale \ include/xlocale \
lib/${CSU_DIR} \ lib/${CSU_DIR} \

2
lib/libc/Makefile
View File

@ -186,7 +186,7 @@ SUBDIR.${MK_TESTS}+= tests
.if (${LIBC_ARCH} == amd64 || ${LIBC_ARCH} == i386) && \ .if (${LIBC_ARCH} == amd64 || ${LIBC_ARCH} == i386) && \
${.TARGETS:Mall} == all && \ ${.TARGETS:Mall} == all && \
defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mifunc} == "" defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mifunc} == ""
#.error ${LIBC_ARCH} libc requires linker ifunc support .error ${LIBC_ARCH} libc requires linker ifunc support
.endif .endif
.if !defined(_SKIP_BUILD) .if !defined(_SKIP_BUILD)

6
lib/libsecureboot/local.trust.mk
View File

@ -8,9 +8,6 @@
# force these for Junos # force these for Junos
#MANIFEST_SKIP_ALWAYS= boot #MANIFEST_SKIP_ALWAYS= boot
MANIFEST_SKIP= boot
XCFLAGS.veopen+= -DMANIFEST_SKIP_MAYBE=\"${MANIFEST_SKIP}\"
VE_HASH_LIST= \ VE_HASH_LIST= \
SHA1 \ SHA1 \
SHA256 \ SHA256 \
@ -40,7 +37,6 @@ VE_SIGNATURE_EXT_LIST+= \
VE_SIGNATURE_LIST+= OPENPGP VE_SIGNATURE_LIST+= OPENPGP
VE_SIGNATURE_EXT_LIST+= asc VE_SIGNATURE_EXT_LIST+= asc
PYTHON ?= /usr/local/bin/python
SIGNER ?= ${SB_TOOLS_PATH:U/volume/buildtools/bin}/sign.py SIGNER ?= ${SB_TOOLS_PATH:U/volume/buildtools/bin}/sign.py
.if exists(${SIGNER}) .if exists(${SIGNER})
@ -103,7 +99,7 @@ ta.h: vc_rsa.pem
.endif .endif
# we take the mtime of this as our baseline time # 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_DEBUG_LEVEL=3
#VE_VERBOSE_DEFAULT=1 #VE_VERBOSE_DEFAULT=1

2
libexec/dma/dmagent/Makefile.depend
View File

@ -2,6 +2,7 @@
# Autogenerated - do NOT edit! # Autogenerated - do NOT edit!
DIRDEPS = \ DIRDEPS = \
gnu/lib/csu \
include \ include \
include/arpa \ include/arpa \
include/xlocale \ include/xlocale \
@ -10,6 +11,7 @@ DIRDEPS = \
lib/libcompiler_rt \ lib/libcompiler_rt \
secure/lib/libcrypto \ secure/lib/libcrypto \
secure/lib/libssl \ secure/lib/libssl \
usr.bin/yacc.host \
.include <dirdeps.mk> .include <dirdeps.mk>

3
libexec/rc/rc.d/tmp
View File

@ -41,9 +41,6 @@ load_rc_config $name
mount_tmpmfs() mount_tmpmfs()
{ {
if ! /bin/df /tmp | grep -q "^/dev/md[0-9].* /tmp"; then 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}" mount_md ${tmpsize} /tmp "${tmpmfs_flags}"
chmod 01777 /tmp chmod 01777 /tmp
fi fi

2
sbin/veriexec/Makefile.depend
View File

@ -2,6 +2,7 @@
# Autogenerated - do NOT edit! # Autogenerated - do NOT edit!
DIRDEPS = \ DIRDEPS = \
gnu/lib/csu \
include \ include \
include/xlocale \ include/xlocale \
lib/${CSU_DIR} \ lib/${CSU_DIR} \
@ -10,7 +11,6 @@ DIRDEPS = \
lib/libcompiler_rt \ lib/libcompiler_rt \
lib/libsecureboot \ lib/libsecureboot \
lib/libveriexec \ lib/libveriexec \
usr.bin/yacc.host \
.include <dirdeps.mk> .include <dirdeps.mk>

5
stand/efi/loader/Makefile
View File

@ -102,8 +102,3 @@ DPADD= ${LDR_INTERP} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSA} ${LDSCRIPT}
LDADD= ${LDR_INTERP} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSA} LDADD= ${LDR_INTERP} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSA}
.include <bsd.prog.mk> .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
stand/i386/loader/Makefile
View File

@ -1,5 +1,5 @@
# $FreeBSD$ # $FreeBSD$
.if 0
HAVE_ZFS= ${MK_LOADER_ZFS} HAVE_ZFS= ${MK_LOADER_ZFS}
LOADER_NET_SUPPORT?= yes LOADER_NET_SUPPORT?= yes
@ -11,10 +11,6 @@ LOADER_MSDOS_SUPPORT?= yes
LOADER_UFS_SUPPORT?= yes LOADER_UFS_SUPPORT?= yes
LOADER_GZIP_SUPPORT?= yes LOADER_GZIP_SUPPORT?= yes
LOADER_BZIP2_SUPPORT?= yes LOADER_BZIP2_SUPPORT?= yes
.else
LOADER_NET_SUPPORT?= yes
LOADER_UFS_SUPPORT?= yes
.endif
.include <bsd.init.mk> .include <bsd.init.mk>
@ -60,8 +56,8 @@ LIBI386= ${BOOTOBJ}/i386/libi386/libi386.a
CFLAGS+= -I${BOOTSRC}/i386 CFLAGS+= -I${BOOTSRC}/i386
# Debug me! # Debug me!
CFLAGS+= -g #CFLAGS+= -g
LDFLAGS+= -g #LDFLAGS+= -g
${LOADER}: ${LOADER}.bin ${BTXLDR} ${BTXKERN} ${LOADER}: ${LOADER}.bin ${BTXLDR} ${BTXKERN}
btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \ btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \