From owner-svn-src-head@freebsd.org  Sun Jul 19 23:54:03 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1157E36DEA8;
 Sun, 19 Jul 2020 23:54:03 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4B91sk6jNKz4DFN;
 Sun, 19 Jul 2020 23:54:02 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CA0A423E9A;
 Sun, 19 Jul 2020 23:54:02 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06JNs2kE077345;
 Sun, 19 Jul 2020 23:54:02 GMT (envelope-from sjg@FreeBSD.org)
Received: (from sjg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06JNs0gw077337;
 Sun, 19 Jul 2020 23:54:00 GMT (envelope-from sjg@FreeBSD.org)
Message-Id: <202007192354.06JNs0gw077337@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sjg set sender to sjg@FreeBSD.org
 using -f
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Sun, 19 Jul 2020 23:54:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r363350 - in head: lib/libbearssl lib/libc
 lib/libsecureboot libexec/dma/dmagent libexec/rc/rc.d sbin/veriexec
 stand/efi/loader stand/i386/loader usr.bin/bmake/unit-tests
X-SVN-Group: head
X-SVN-Commit-Author: sjg
X-SVN-Commit-Paths: in head: lib/libbearssl lib/libc lib/libsecureboot
 libexec/dma/dmagent libexec/rc/rc.d sbin/veriexec stand/efi/loader
 stand/i386/loader usr.bin/bmake/unit-tests
X-SVN-Commit-Revision: 363350
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Jul 2020 23:54:03 -0000

Author: sjg
Date: Sun Jul 19 23:54:00 2020
New Revision: 363350
URL: https://svnweb.freebsd.org/changeset/base/363350

Log:
  Oops missed Makefile.config

Added:
  head/usr.bin/bmake/unit-tests/Makefile.config   (contents, props changed)
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:45:49 2020	(r363349)
+++ head/lib/libbearssl/Makefile.depend	Sun Jul 19 23:54:00 2020	(r363350)
@@ -2,7 +2,6 @@
 # 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:45:49 2020	(r363349)
+++ head/lib/libc/Makefile	Sun Jul 19 23:54:00 2020	(r363350)
@@ -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:45:49 2020	(r363349)
+++ head/lib/libsecureboot/local.trust.mk	Sun Jul 19 23:54:00 2020	(r363350)
@@ -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 \
@@ -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})
@@ -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
 

Modified: head/libexec/dma/dmagent/Makefile.depend
==============================================================================
--- head/libexec/dma/dmagent/Makefile.depend	Sun Jul 19 23:45:49 2020	(r363349)
+++ head/libexec/dma/dmagent/Makefile.depend	Sun Jul 19 23:54:00 2020	(r363350)
@@ -2,7 +2,6 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/arpa \
 	include/xlocale \
@@ -11,7 +10,6 @@ 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:45:49 2020	(r363349)
+++ head/libexec/rc/rc.d/tmp	Sun Jul 19 23:54:00 2020	(r363350)
@@ -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

Modified: head/sbin/veriexec/Makefile.depend
==============================================================================
--- head/sbin/veriexec/Makefile.depend	Sun Jul 19 23:45:49 2020	(r363349)
+++ head/sbin/veriexec/Makefile.depend	Sun Jul 19 23:54:00 2020	(r363350)
@@ -2,7 +2,6 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
-	gnu/lib/csu \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
@@ -11,6 +10,7 @@ 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:45:49 2020	(r363349)
+++ head/stand/efi/loader/Makefile	Sun Jul 19 23:54:00 2020	(r363350)
@@ -102,3 +102,8 @@ 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:45:49 2020	(r363349)
+++ head/stand/i386/loader/Makefile	Sun Jul 19 23:54:00 2020	(r363350)
@@ -1,5 +1,5 @@
 # $FreeBSD$
-
+.if 0
 HAVE_ZFS=		${MK_LOADER_ZFS}
 
 LOADER_NET_SUPPORT?=	yes
@@ -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>
 
@@ -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} \

Added: head/usr.bin/bmake/unit-tests/Makefile.config
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/usr.bin/bmake/unit-tests/Makefile.config	Sun Jul 19 23:54:00 2020	(r363350)
@@ -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