diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2017-12-29 15:38:43 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2017-12-29 15:38:43 +0000 |
| commit | 5a57de683b789b9755c88d638d2dcf6c2aadf433 (patch) | |
| tree | 7c863aa2c345eec7e730c49f423c3d6d60049093 /tools/tools/sysbuild | |
| parent | 294a9f4f9ead81acaaa5d1410f2eadfbe5e7010f (diff) | |
| download | src-test2-5a57de683b789b9755c88d638d2dcf6c2aadf433.tar.gz src-test2-5a57de683b789b9755c88d638d2dcf6c2aadf433.zip | |
Notes
Diffstat (limited to 'tools/tools/sysbuild')
| -rw-r--r-- | tools/tools/sysbuild/sysbuild.sh | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/tools/tools/sysbuild/sysbuild.sh b/tools/tools/sysbuild/sysbuild.sh index 78c06a3ca6b1..6317d1d24830 100644 --- a/tools/tools/sysbuild/sysbuild.sh +++ b/tools/tools/sysbuild/sysbuild.sh @@ -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}" |