diff options
| author | phk <phk@FreeBSD.org> | 2014-12-01 22:39:35 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2014-12-01 22:39:35 +0000 |
| commit | c1d0ac474fed343827d7b35b96b54094b8195213 (patch) | |
| tree | 8cd481c66b8148a7e958fb14d69e1cddf0a20470 /tools | |
| parent | 93293fc1c45f1d38bd634e54ff857a530cb3de9c (diff) | |
| download | FreeBSD-src-c1d0ac474fed343827d7b35b96b54094b8195213.zip FreeBSD-src-c1d0ac474fed343827d7b35b96b54094b8195213.tar.gz | |
Make this work with pkgng, and allow PORTS_OPTS to be passed in
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/tools/nanobsd/fill_pkg.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/tools/nanobsd/fill_pkg.sh b/tools/tools/nanobsd/fill_pkg.sh index 8ee953e..be240a3 100644 --- a/tools/tools/nanobsd/fill_pkg.sh +++ b/tools/tools/nanobsd/fill_pkg.sh @@ -57,8 +57,8 @@ ports_recurse() ( else ( cd $d - rd=`make -V RUN_DEPENDS` - ld=`make -V LIB_DEPENDS` + rd=`make -V RUN_DEPENDS ${PORTS_OPTS}` + ld=`make -V LIB_DEPENDS ${PORTS_OPTS}` for x in $rd $ld do @@ -84,8 +84,8 @@ done for i in `cat $PL` do p=`(cd $i && make -V PKGNAME)` - if [ -f $NANO_PKG_DUMP/$p.tbz ] ; then - ln -s $NANO_PKG_DUMP/$p.tbz $NANO_PACKAGE_DIR + if [ -f $NANO_PKG_DUMP/$p.t[bx]z ] ; then + ln -s $NANO_PKG_DUMP/$p.t[bx]z $NANO_PACKAGE_DIR else echo "Package $p misssing in $NANO_PKG_DUMP" 1>&2 exit 1 |
