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 85a9c96b70dc5bd68ca4bb25fe3adf53f3d62e48..d0193c1b7c77649a0799585c464053a7b6f7fd9a 100644 (file)
--- 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 6f83013849eca1a5176fcb0860eec10132a206c7..91d9d6bbee4597cd8637177cf209efa52ddf5785 100755 (executable)
--- 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/