release.sh: minor -L fix
This commit is contained in:
parent
13ded5339f
commit
2e84a3f594
1 changed files with 7 additions and 2 deletions
|
@ -123,7 +123,8 @@ do
|
||||||
;;
|
;;
|
||||||
l) PKG_ADD_URL=file://$PACKAGEDIR/All
|
l) PKG_ADD_URL=file://$PACKAGEDIR/All
|
||||||
;;
|
;;
|
||||||
L) PACKAGEURL="$OPTARG"
|
L) PKG_ADD_URL="$OPTARG"
|
||||||
|
CUSTOM_PACKAGES=1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
@ -255,9 +256,13 @@ chroot $RELEASEDIR "PATH=/$XBIN:/usr/pkg/bin sh -x /usr/$SRC/tools/chrootmake.sh
|
||||||
|
|
||||||
for p in $PREINSTALLED_PACKAGES
|
for p in $PREINSTALLED_PACKAGES
|
||||||
do echo " * Pre-installing: $p from $PKG_ADD_URL"
|
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
|
done
|
||||||
|
|
||||||
|
if [ "$CUSTOM_PACKAGES" ]
|
||||||
|
then echo $PKG_ADD_URL >$RELEASEDIR/usr/pkg/etc/pkgin/repositories.conf
|
||||||
|
fi
|
||||||
|
|
||||||
echo " * Chroot build"
|
echo " * Chroot build"
|
||||||
chroot $RELEASEDIR "PATH=/$XBIN:/usr/pkg/bin MAKEMAP=$MAKEMAP sh -x /usr/$SRC/tools/chrootmake.sh" || exit 1
|
chroot $RELEASEDIR "PATH=/$XBIN:/usr/pkg/bin MAKEMAP=$MAKEMAP sh -x /usr/$SRC/tools/chrootmake.sh" || exit 1
|
||||||
# Copy built images for cd booting
|
# Copy built images for cd booting
|
||||||
|
|
Loading…
Reference in a new issue