Date: Fri, 29 Dec 2017 15:38:43 +0000 (UTC) From: Poul-Henning Kamp <phk@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r327345 - head/tools/tools/sysbuild Message-ID: <201712291538.vBTFchoN081380@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: phk Date: Fri Dec 29 15:38:43 2017 New Revision: 327345 URL: https://svnweb.freebsd.org/changeset/base/327345 Log: Add a crude workaround for ports with flavors Modified: head/tools/tools/sysbuild/sysbuild.sh Modified: head/tools/tools/sysbuild/sysbuild.sh ============================================================================== --- head/tools/tools/sysbuild/sysbuild.sh Fri Dec 29 15:04:49 2017 (r327344) +++ head/tools/tools/sysbuild/sysbuild.sh Fri Dec 29 15:38:43 2017 (r327345) @@ -196,13 +196,20 @@ ports_recurse() ( echo "$t" >> /tmp/_.plist.tdone for d do + fl="" if [ ! -d $d ] ; then - echo "Missing port $d ($t)" 1>&2 - continue + fl=FLAVOR=`expr $d : '.*@\(.*\)'` + bd=`expr $d : '\(.*\)@.*'` + if [ ! -d $bd ] ; then + echo "Missing port $d ($t) (fl $fl) (bd $bd)" 1>&2 + continue + fi + echo "Flavored port $d ($t) (fl $fl) (bd $bd)" 1>&2 + d=$bd fi d=`cd /usr/ports && cd $d && /bin/pwd` if [ ! -f $d/Makefile ] ; then - echo "Missing port $d" 1>&2 + echo "Missing port (Makefile) $d" 1>&2 continue fi if [ "x$t" != "x." ] ; then @@ -216,7 +223,7 @@ ports_recurse() ( ( cd $d l="" - for a in `ports_make -V _UNIFIED_DEPENDS` + for a in `ports_make -V _UNIFIED_DEPENDS $fl` do x=`expr "$a" : '.*:\(.*\)'` l="${l} ${x}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712291538.vBTFchoN081380>