From owner-dev-commits-src-all@freebsd.org Wed Jun 30 17:09:21 2021 Return-Path: Delivered-To: dev-commits-src-all@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 3F505648386; Wed, 30 Jun 2021 17:09:21 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GFSW519Cqz4v6G; Wed, 30 Jun 2021 17:09:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0C9B3107F3; Wed, 30 Jun 2021 17:09:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15UH9KKY058056; Wed, 30 Jun 2021 17:09:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15UH9K9e058055; Wed, 30 Jun 2021 17:09:20 GMT (envelope-from git) Date: Wed, 30 Jun 2021 17:09:20 GMT Message-Id: <202106301709.15UH9K9e058055@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 91604330e607 - main - sysbuild: Also copy /var/db/zoneinfo MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91604330e6073e49805849efdb34e7fdfdbe845b Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jun 2021 17:09:21 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=91604330e6073e49805849efdb34e7fdfdbe845b commit 91604330e6073e49805849efdb34e7fdfdbe845b Author: Jose Luis Duran AuthorDate: 2021-06-20 02:19:00 +0000 Commit: Warner Losh CommitDate: 2021-06-30 17:08:26 +0000 sysbuild: Also copy /var/db/zoneinfo Per tzsetup(8), /etc/localtime and /var/db/zoneinfo go hand in hand. Remove extra white spaces as well. Reviewed by: imp@, phk@ (informal no objection email) Pull Request: https://github.com/freebsd/freebsd-src/pull/486 --- tools/tools/sysbuild/sysbuild.sh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tools/tools/sysbuild/sysbuild.sh b/tools/tools/sysbuild/sysbuild.sh index 2ad19b75659f..3b4502014642 100644 --- a/tools/tools/sysbuild/sysbuild.sh +++ b/tools/tools/sysbuild/sysbuild.sh @@ -243,7 +243,7 @@ ports_recurse() ( ports_build() ( - ports_recurse . $PORTS_WE_WANT + ports_recurse . $PORTS_WE_WANT if [ "x${PKG_DIR}" != "x" ] ; then mkdir -p ${PKG_DIR} @@ -262,7 +262,7 @@ ports_build() ( ( cd $p - ports_make clean all install + ports_make clean all install ) > _.$b 2>&1 < /dev/null continue fi @@ -340,7 +340,7 @@ ports_prefetch() ( ) > /${ldir}/_.prefetch.$b 2>&1 done echo "Done" >> /${ldir}/_.prefetch - ) + ) ) ####################################################################### @@ -442,7 +442,7 @@ if $do_prefetch ; then mkdir -p /tmp/sysbuild/ports ln -s ${distfile_cache} /tmp/sysbuild/ports/distfiles export PORTS_OPTS=CD_MOUNTPTS=/tmp/sysbuild - ports_prefetch /tmp + ports_prefetch /tmp exit 0 fi @@ -602,14 +602,18 @@ fi if [ -f /etc/localtime ] ; then log_it copy localtime cp /etc/localtime ${SBMNT}/etc + if [ -f /var/db/zoneinfo ] ; then + log_it copy zoneinfo + cp /var/db/zoneinfo ${SBMNT}/var/db + fi fi log_it ldconfig in chroot chroot ${SBMNT} sh /etc/rc.d/ldconfig start log_it before_ports -( - before_ports +( + before_ports ) log_it fixing fstab @@ -623,14 +627,14 @@ cp /tmp/_sb_log ${SBMNT}/tmp b=`basename $0` if [ "x$c_arg" != "x" ] ; then cp $c_arg ${SBMNT}/root - chroot ${SBMNT} sh /root/$0 -c /root/`basename $c_arg` $use_pkg chroot_script + chroot ${SBMNT} sh /root/$0 -c /root/`basename $c_arg` $use_pkg chroot_script else chroot ${SBMNT} sh /root/$0 $use_pkg chroot_script fi cp ${SBMNT}/tmp/_sb_log /tmp log_it create all mountpoints -grep -v '^[ ]*#' ${SBMNT}/etc/fstab | +grep -v '^[ ]*#' ${SBMNT}/etc/fstab | while read a b c do mkdir -p ${SBMNT}/$b