sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

release.sh: Support preinstalled package selection

Browse source 
This allows to both override the default package repository and
preinstalled packages list from the command line or the environment.

Also use everywhere PACKAGEURL.

Change-Id: I3434ff53be769f8d0f890bb5fb44521a0017e123
This commit is contained in:
Lionel Sambuc 2015-03-19 12:39:00 +01:00
parent 6f55e9f11d
commit 426224bbc6
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
releasetools/release.sh
View file

@ -13,6 +13,10 @@ SRC=src
: ${GITBRANCH:=master} : ${GITBRANCH:=master}
: ${BUILDOPTIONS:=} : ${BUILDOPTIONS:=}
# Packages we have to pre-install, and url to use
: ${PACKAGEURL="http://www.minix3.org/pkgsrc/packages/$version_pretty/`uname -m`/All/"}
: ${PREINSTALLED_PACKAGES:="pkg_install pkgin"}
# List of packages included on installation media # List of packages included on installation media
PACKAGELIST=packages.install PACKAGELIST=packages.install
secs=`expr 32 '*' 64` secs=`expr 32 '*' 64`
@ -26,15 +30,6 @@ then echo Please install pkg_install from pkgsrc.
exit 1 exit 1
fi fi
# Packages we have to pre-install, and url to use
PACKAGEURL=http://www.minix3.org/pkgsrc/packages/$version_pretty/`uname -m`/All/
PREINSTALLED_PACKAGES="
pkg_install
pkgin
"
PKG_ADD_URL=$PACKAGEURL
RELEASERC=$HOME/.releaserc RELEASERC=$HOME/.releaserc
if [ -f $RELEASERC ] if [ -f $RELEASERC ]
@ -100,9 +95,9 @@ do
;; ;;
M) MAKEMAP=1 M) MAKEMAP=1
;; ;;
l) PKG_ADD_URL=file://$PACKAGEDIR/All l) PACKAGEURL=file://$PACKAGEDIR/All
;; ;;
L) PKG_ADD_URL="$OPTARG" L) PACKAGEURL="$OPTARG"
CUSTOM_PACKAGES=1 CUSTOM_PACKAGES=1
;; ;;
e) EXTRAS_INSTALL=1 e) EXTRAS_INSTALL=1
@ -203,12 +198,12 @@ date >$RELEASEDIR/CD
rm -f $RELEASEDIR/usr/$SRC/releasetools/revision rm -f $RELEASEDIR/usr/$SRC/releasetools/revision
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 $PACKAGEURL"
$PKG_ADD -f -P $RELEASEDIR $PKG_ADD_URL/$p $PKG_ADD -f -P $RELEASEDIR $PACKAGEURL/$p
done done
if [ "$CUSTOM_PACKAGES" ] if [ "$CUSTOM_PACKAGES" ]
then echo $PKG_ADD_URL >$RELEASEDIR/usr/pkg/etc/pkgin/repositories.conf then echo $PACKAGEURL >$RELEASEDIR/usr/pkg/etc/pkgin/repositories.conf
fi fi
echo " * Resetting timestamps" echo " * Resetting timestamps"