d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle full-path-resolutions to detect the magic-ness of the pkg port.

Browse Source
This commit is contained in:
Poul-Henning Kamp 2014-11-09 15:33:31 +00:00
parent d02d7de76c
commit a52ce850e9
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/tools/sysbuild/sysbuild.sh
View File

@ -160,7 +160,6 @@ fi
set -e
log_it() (
set +x
a="$*"
set `cat /tmp/_sb_log`
TX=`date +%s`
@ -175,7 +174,6 @@ log_it() (
ports_recurse() (
set +x
t=$1
shift
if [ "x$t" = "x." ] ; then
@ -218,7 +216,6 @@ ports_recurse() (
)
ports_build() (
set +x
ports_recurse . $PORTS_WE_WANT
@ -229,17 +226,21 @@ ports_build() (
t=`echo $p | sed 's,/usr/ports/,,'`
pn=`cd $p && make package-name`
if pkg info $pn > /dev/null 2>&1 ; then
log_it "Already installed: $t ($pn)"
if [ "x$p" == "x/usr/ports/ports-mgmt/pkg" -o \
"x$p" == "x/freebsd/ports/ports-mgmt/pkg" ] ; then
log_it "Very Special: $t ($pn)"
(
cd $p
make clean ${PORTS_OPTS}
make all ${PORTS_OPTS}
make install ${PORTS_OPTS}
) > _.$b 2>&1 < /dev/null
continue
fi
if [ "x$p" == "x/usr/ports/ports-mgmt/pkg" ] ; then
log_it "Very Special: $t ($pn)"
(
cd $p
make clean all install ${PORTS_OPTS}
) > _.$b 2>&1 < /dev/null
if pkg info $pn > /dev/null 2>&1 ; then
log_it "Already installed: $t ($pn)"
continue
fi
@ -380,7 +381,6 @@ done
#######################################################################
if [ "x$1" = "xchroot_script" ] ; then
set +x
set -e
shift