Date: Mon, 1 Dec 2014 22:39:36 +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: r275384 - head/tools/tools/nanobsd Message-ID: <201412012239.sB1MdaOS001088@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: phk Date: Mon Dec 1 22:39:35 2014 New Revision: 275384 URL: https://svnweb.freebsd.org/changeset/base/275384 Log: Make this work with pkgng, and allow PORTS_OPTS to be passed in Modified: head/tools/tools/nanobsd/fill_pkg.sh Modified: head/tools/tools/nanobsd/fill_pkg.sh ============================================================================== --- head/tools/tools/nanobsd/fill_pkg.sh Mon Dec 1 22:37:36 2014 (r275383) +++ head/tools/tools/nanobsd/fill_pkg.sh Mon Dec 1 22:39:35 2014 (r275384) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412012239.sB1MdaOS001088>