From owner-dev-commits-src-main@freebsd.org Wed Dec 30 16:05:26 2020 Return-Path: Delivered-To: dev-commits-src-main@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 181CE4C770F; Wed, 30 Dec 2020 16:05:26 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D5bjL0Fbnz3q9P; Wed, 30 Dec 2020 16:05:26 +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 EA6A020C28; Wed, 30 Dec 2020 16:05:25 +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 0BUG5PD7041695; Wed, 30 Dec 2020 16:05:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 0BUG5P5m041694; Wed, 30 Dec 2020 16:05:25 GMT (envelope-from git) Date: Wed, 30 Dec 2020 16:05:25 GMT Message-Id: <202012301605.0BUG5P5m041694@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Poul-Henning Kamp Subject: git: 07b0027f6c21 - main - Handle ports FLAVOR better. (+minor polish) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: phk X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 07b0027f6c21bfb42769ad38bc763d58c988e5a5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Commit messages for the main branch of the src repository." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Dec 2020 16:05:26 -0000 The branch main has been updated by phk: URL: https://cgit.FreeBSD.org/src/commit/?id=07b0027f6c21bfb42769ad38bc763d58c988e5a5 commit 07b0027f6c21bfb42769ad38bc763d58c988e5a5 Author: Poul-Henning Kamp AuthorDate: 2020-12-30 16:04:32 +0000 Commit: Poul-Henning Kamp CommitDate: 2020-12-30 16:05:09 +0000 Handle ports FLAVOR better. (+minor polish) --- tools/tools/sysbuild/sysbuild.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/tools/sysbuild/sysbuild.sh b/tools/tools/sysbuild/sysbuild.sh index 950f9f4da50d..2ad19b75659f 100644 --- a/tools/tools/sysbuild/sysbuild.sh +++ b/tools/tools/sysbuild/sysbuild.sh @@ -196,11 +196,14 @@ ports_recurse() ( echo "$t" >> /tmp/_.plist.tdone for d do + if [ "x$d" == "xpatch" ] ; then + continue + fi fl="" if [ ! -d $d ] ; then fl=FLAVOR=`expr $d : '.*@\(.*\)'` bd=`expr $d : '\(.*\)@.*'` - if [ ! -d $bd ] ; then + if [ ! -d "$bd" ] ; then echo "Missing port $d ($t) (fl $fl) (bd $bd)" 1>&2 continue fi @@ -485,7 +488,7 @@ if $do_world ; then rm -rf /usr/obj (cd /freebsd && mkdir -p ${OBJ_PATH} && ln -s ${OBJ_PATH} /usr/obj) else - rm -rf /usr/obj + rm -rf /usr/obj/* mkdir -p /usr/obj fi fi @@ -496,6 +499,10 @@ for i in ${PORTS_WE_WANT} do ( cd /usr/ports + if [ ! -d $i ] ; then + fl=FLAVOR=`expr $i : '.*@\(.*\)'` + i=`expr $i : '\(.*\)@.*'` + fi if [ ! -d $i ] ; then echo "Port $i not found" 1>&2 exit 2