diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2020-12-30 16:04:32 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2020-12-30 16:05:09 +0000 |
| commit | 07b0027f6c21bfb42769ad38bc763d58c988e5a5 (patch) | |
| tree | 96b9383f2d42b2b0e7e1d1812b30515a81ea98d5 | |
| parent | b6d54565c238399b6e90b21d5bb9f08d5dc91960 (diff) | |
| download | src-07b0027f6c21bfb42769ad38bc763d58c988e5a5.tar.gz src-07b0027f6c21bfb42769ad38bc763d58c988e5a5.zip | |
Handle ports FLAVOR better. (+minor polish)
| -rw-r--r-- | tools/tools/sysbuild/sysbuild.sh | 11 |
1 files 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 |