From: Lionel Sambuc <lionel@minix3.org>
Date: Fri, 12 Jul 2013 16:27:05 +0000 (+0200)
Subject: releasetools/release.sh: cleanup & enhancements
X-Git-Tag: v3.3.0~892
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zlib_tech.html?a=commitdiff_plain;h=refs%2Fchanges%2F73%2F673%2F2;p=minix.git

releasetools/release.sh: cleanup & enhancements

 - use the proper  make variable to ignore file lists
   SLOPPY_FLIST instead of CHECKFLIST, which was a minix hack.

 - Add BUILDOPTIONS such that the users can activate optional
   features without editing the script.

Change-Id: Id731db96c38c2118c4c58e007f2804008a7a893f
---

diff --git a/Makefile b/Makefile
index 85a9c96b7..d0193c1b7 100644
--- a/Makefile
+++ b/Makefile
@@ -315,7 +315,7 @@ distribution buildworld: .PHONY .MAKE
 .endif
 	${MAKEDIRTARGET} . build NOPOSTINSTALL=1
 	${MAKEDIRTARGET} etc distribution INSTALL_DONE=1
-.if defined(DESTDIR) && ${DESTDIR} != "" && ${DESTDIR} != "/"  && ${CHECKFLIST:Uyes} == "yes"
+.if defined(DESTDIR) && ${DESTDIR} != "" && ${DESTDIR} != "/"
 	${MAKEDIRTARGET} . postinstall-fix-obsolete
 	${MAKEDIRTARGET} distrib/sets checkflist
 .endif
diff --git a/releasetools/release.sh b/releasetools/release.sh
index 6f8301384..91d9d6bbe 100755
--- a/releasetools/release.sh
+++ b/releasetools/release.sh
@@ -11,6 +11,7 @@ PACKAGEDIR=/usr/pkgsrc/packages/$version_pretty/`uname -m`
 SRC=src
 : ${REPO:=git://git.minix3.org/minix}
 : ${GITBRANCH:=master}
+: ${BUILDOPTIONS:=}
 
 # List of packages included on installation media
 PACKAGELIST=packages.install
@@ -240,7 +241,7 @@ echo " * Build"
 ##########################################################################
 
 cd $RELEASEDIR/usr/src
-make distribution DESTDIR=$RELEASEDIR CHECKFLIST=no
+make distribution DESTDIR=$RELEASEDIR SLOPPY_FLIST=yes $BUILDOPTIONS
 make -C releasetools do-hdboot DESTDIR=$RELEASEDIR MKINSTALLBOOT=yes
 cp $RELEASEDIR/usr/mdec/boot_monitor $RELEASEDIR
 cp $RELEASEDIR/boot/minix_latest/* $RELEASEDIR/boot/minix_default/