svn commit: r363351 - in head: lib/libbearssl lib/libc lib/libsecureboot libexec/dma/dmagent libexec/rc/rc.d sbin/veriexec stand/efi/loader stand/i386/loader
Simon J. Gerraty
sjg at FreeBSD.org
Sun Jul 19 23:56:21 UTC 2020
Author: sjg
Date: Sun Jul 19 23:56:19 2020
New Revision: 363351
URL: https://svnweb.freebsd.org/changeset/base/363351
Log:
Revert that!
Modified:
head/lib/libbearssl/Makefile.depend
head/lib/libc/Makefile
head/lib/libsecureboot/local.trust.mk
head/libexec/dma/dmagent/Makefile.depend
head/libexec/rc/rc.d/tmp
head/sbin/veriexec/Makefile.depend
head/stand/efi/loader/Makefile
head/stand/i386/loader/Makefile
Modified: head/lib/libbearssl/Makefile.depend
==============================================================================
--- head/lib/libbearssl/Makefile.depend Sun Jul 19 23:54:00 2020 (r363350)
+++ head/lib/libbearssl/Makefile.depend Sun Jul 19 23:56:19 2020 (r363351)
@@ -2,6 +2,7 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
+ gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
Modified: head/lib/libc/Makefile
==============================================================================
--- head/lib/libc/Makefile Sun Jul 19 23:54:00 2020 (r363350)
+++ head/lib/libc/Makefile Sun Jul 19 23:56:19 2020 (r363351)
@@ -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)
Modified: head/lib/libsecureboot/local.trust.mk
==============================================================================
--- head/lib/libsecureboot/local.trust.mk Sun Jul 19 23:54:00 2020 (r363350)
+++ head/lib/libsecureboot/local.trust.mk Sun Jul 19 23:56:19 2020 (r363351)
@@ -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
Modified: head/libexec/dma/dmagent/Makefile.depend
==============================================================================
--- head/libexec/dma/dmagent/Makefile.depend Sun Jul 19 23:54:00 2020 (r363350)
+++ head/libexec/dma/dmagent/Makefile.depend Sun Jul 19 23:56:19 2020 (r363351)
@@ -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>
Modified: head/libexec/rc/rc.d/tmp
==============================================================================
--- head/libexec/rc/rc.d/tmp Sun Jul 19 23:54:00 2020 (r363350)
+++ head/libexec/rc/rc.d/tmp Sun Jul 19 23:56:19 2020 (r363351)
@@ -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
Modified: head/sbin/veriexec/Makefile.depend
==============================================================================
--- head/sbin/veriexec/Makefile.depend Sun Jul 19 23:54:00 2020 (r363350)
+++ head/sbin/veriexec/Makefile.depend Sun Jul 19 23:56:19 2020 (r363351)
@@ -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>
Modified: head/stand/efi/loader/Makefile
==============================================================================
--- head/stand/efi/loader/Makefile Sun Jul 19 23:54:00 2020 (r363350)
+++ head/stand/efi/loader/Makefile Sun Jul 19 23:56:19 2020 (r363351)
@@ -102,8 +102,3 @@ DPADD= ${LDR_INTERP} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT
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}\"
-
Modified: head/stand/i386/loader/Makefile
==============================================================================
--- head/stand/i386/loader/Makefile Sun Jul 19 23:54:00 2020 (r363350)
+++ head/stand/i386/loader/Makefile Sun Jul 19 23:56:19 2020 (r363351)
@@ -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} \
More information about the svn-src-head
mailing list