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

releasetools/release.sh: cleanup & enhancements

Browse source 
- 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
This commit is contained in:
Lionel Sambuc 2013-07-12 18:27:05 +02:00 committed by Gerrit Code Review
parent 2a8a99cc6a
commit bb65c81387
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -315,7 +315,7 @@ distribution buildworld: .PHONY .MAKE
.endif .endif
${MAKEDIRTARGET} . build NOPOSTINSTALL=1 ${MAKEDIRTARGET} . build NOPOSTINSTALL=1
${MAKEDIRTARGET} etc distribution INSTALL_DONE=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} . postinstall-fix-obsolete
${MAKEDIRTARGET} distrib/sets checkflist ${MAKEDIRTARGET} distrib/sets checkflist
.endif .endif

3
releasetools/release.sh
View file

@ -11,6 +11,7 @@ PACKAGEDIR=/usr/pkgsrc/packages/$version_pretty/`uname -m`
SRC=src SRC=src
: ${REPO:=git://git.minix3.org/minix} : ${REPO:=git://git.minix3.org/minix}
: ${GITBRANCH:=master} : ${GITBRANCH:=master}
: ${BUILDOPTIONS:=}
# List of packages included on installation media # List of packages included on installation media
PACKAGELIST=packages.install PACKAGELIST=packages.install
@ -240,7 +241,7 @@ echo " * Build"
########################################################################## ##########################################################################
cd $RELEASEDIR/usr/src 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 make -C releasetools do-hdboot DESTDIR=$RELEASEDIR MKINSTALLBOOT=yes
cp $RELEASEDIR/usr/mdec/boot_monitor $RELEASEDIR cp $RELEASEDIR/usr/mdec/boot_monitor $RELEASEDIR
cp $RELEASEDIR/boot/minix_latest/* $RELEASEDIR/boot/minix_default/ cp $RELEASEDIR/boot/minix_latest/* $RELEASEDIR/boot/minix_default/