From 8da0925650f9dc11ce29f5ea8f752b8c1c03bc5a Mon Sep 17 00:00:00 2001
From: Ben Gras <ben@minix3.org>
Date: Thu, 5 Aug 2010 13:56:51 +0000
Subject: [PATCH] release.sh - let some packages come pre-installed (right now
 just pkgin)

---
 tools/chrootmake.sh |  7 ++++++-
 tools/release.sh    | 17 ++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/tools/chrootmake.sh b/tools/chrootmake.sh
index 84c2813ca..4f07698e0 100755
--- a/tools/chrootmake.sh
+++ b/tools/chrootmake.sh
@@ -2,7 +2,12 @@
 set -e
 export SHELL=/bin/sh
 cd /usr/src 
-make etcfiles
+
+if [ $# -gt 0 ]
+then	make $@
+	exit $?
+fi
+
 make world
 cd tools 
 rm revision
diff --git a/tools/release.sh b/tools/release.sh
index c86a88249..01df3d8eb 100755
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -17,6 +17,10 @@ PACKAGESOURCELIST=package_sources.install
 secs=`expr 32 '*' 64`
 export SHELL=/bin/sh
 
+# Packages we have to pre-install, and url to use
+PREINSTALLED_PACKAGES=pkgin-0.3.3.1nb1
+PACKAGEURL=ftp://ftp.minix3.org/pub/minix/packages/`uname -r`/`uname -m`/All/
+
 RELEASERC=$HOME/.releaserc
 
 if [ -f $RELEASERC ]
@@ -360,8 +364,19 @@ mkdir -p $RELEASEDIR/usr/share/mk
 chmod 755 $RELEASEDIR/usr/share/mk
 cp $RELEASEDIR/usr/src/share/mk/* $RELEASEDIR/usr/share/mk/
 chown -R root $RELEASEDIR/usr/share/mk
-echo " * Chroot build"
 cp chrootmake.sh $RELEASEDIR/usr/$SRC/tools/chrootmake.sh
+
+echo " * Make hierarchy"
+chroot $RELEASEDIR "PATH=/$XBIN sh -x /usr/$SRC/tools/chrootmake.sh etcfiles" || exit 1
+
+if [ "$COPY" -ne 1 ]
+then	for p in $PREINSTALLED_PACKAGES
+	do	echo " * Pre-installing: $p from $url"
+		pkg_add -P $RELEASEDIR $PACKAGEURL/$p
+	done
+fi
+
+echo " * Chroot build"
 chroot $RELEASEDIR "PATH=/$XBIN MAKEMAP=$MAKEMAP sh -x /usr/$SRC/tools/chrootmake.sh" || exit 1
 # Copy built images for cd booting
 cp $RELEASEDIR/boot/image_big image