From db8c7af0b8940df9123b30c6dac935ab97eb2e97 Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Thu, 10 Mar 2011 12:54:58 +0000 Subject: [PATCH] release.sh: explicitly use the pkgin pkg_install pkg_add . when switching from the base pkg_install to the pkgin pkg_install, the version number changed, causing a compatability problem if the old base system binary was inadvertently left behind. . this change checks for that situation by specifically invoking the pkgin instance of pkg_install and telling the user to install it if it doesn't exist. --- tools/release.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/release.sh b/tools/release.sh index 22995509d..e7c6b6b5a 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -11,6 +11,13 @@ PACKAGELIST=packages.install secs=`expr 32 '*' 64` export SHELL=/bin/sh +PKG_ADD=/usr/pkg/sbin/pkg_add + +if [ ! -x $PKG_ADD ] +then echo Please install pkg_install from pkgsrc. + exit 1 +fi + # Packages we have to pre-install, and url to use PREINSTALLED_PACKAGES="pkgin-0.3.3.4.tgz pkg_install-20101212 bmake-20100808" PACKAGEURL=ftp://ftp.minix3.org/pub/minix/packages/`uname -r`/`uname -m`/All/ @@ -416,7 +423,7 @@ chroot $RELEASEDIR "PATH=/$XBIN sh -x /usr/$SRC/tools/chrootmake.sh etcfiles" || for p in $PREINSTALLED_PACKAGES do echo " * Pre-installing: $p from $PACKAGEURL" - pkg_add -P $RELEASEDIR $PACKAGEURL/$p + $PKG_ADD -P $RELEASEDIR $PACKAGEURL/$p done echo " * Chroot build" -- 2.44.0