From 2e84a3f59444af9113bb18ea8f68465b2a8b7c4d Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Mon, 15 Aug 2011 21:40:14 +0000 Subject: [PATCH] release.sh: minor -L fix --- tools/release.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/release.sh b/tools/release.sh index 7301c2aa1..8da1ca0ca 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -123,7 +123,8 @@ do ;; l) PKG_ADD_URL=file://$PACKAGEDIR/All ;; - L) PACKAGEURL="$OPTARG" + L) PKG_ADD_URL="$OPTARG" + CUSTOM_PACKAGES=1 ;; esac done @@ -255,9 +256,13 @@ chroot $RELEASEDIR "PATH=/$XBIN:/usr/pkg/bin sh -x /usr/$SRC/tools/chrootmake.sh for p in $PREINSTALLED_PACKAGES do echo " * Pre-installing: $p from $PKG_ADD_URL" - $PKG_ADD -P $RELEASEDIR $PKG_ADD_URL/$p + $PKG_ADD -f -P $RELEASEDIR $PKG_ADD_URL/$p done +if [ "$CUSTOM_PACKAGES" ] +then echo $PKG_ADD_URL >$RELEASEDIR/usr/pkg/etc/pkgin/repositories.conf +fi + echo " * Chroot build" chroot $RELEASEDIR "PATH=/$XBIN:/usr/pkg/bin MAKEMAP=$MAKEMAP sh -x /usr/$SRC/tools/chrootmake.sh" || exit 1 # Copy built images for cd booting -- 2.44.0