Can make image_small too

diff --git a/tools/Makefile b/tools/Makefile
index d7d7a7686eef2b276835867b2605337e693a5fde..f6d1aba2c0effe8a52f2e113728542aca427b07f 100755 (executable)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -61,6 +61,11 @@ image:  includes
        cd ../drivers && $(MAKE) image
        installboot -image $@ $(PROGRAMS)
 
+image_small:  includes
+       cd ../kernel && $(MAKE) 
+       cd ../servers && $(MAKE) EXTRA_OPTS=-D_MINIX_SMALL=1 image
+       cd ../drivers && $(MAKE) EXTRA_OPTS=$(EXTRA_OPTS) image
+       installboot -image $@ $(PROGRAMS)
 
 # rebuild the program or system libraries
 includes:

diff --git a/tools/mkboot b/tools/mkboot
index 34509704709b15bb37ecc1fcde2332bd55dac6a0..f4382a1fbf50f9094a12aac7d95e71f22f2fb8b0 100755 (executable)
--- a/tools/mkboot
+++ b/tools/mkboot
@@ -170,11 +170,11 @@ cdfdboot)
        mkdir /mnt/boot
        mkdir /mnt/boot/image
        ( cd /mnt/dev && /usr/src/commands/scripts/MAKEDEV.sh std )
-       cp -p image /mnt/boot/image || exit 1
+       cp -p image image_* /mnt/boot/image || exit 1
        cp -p ../boot/boot /mnt/boot/boot || exit 1
        umount $dev || exit 1
        installboot -d $dev ../boot/bootblock boot/boot || exit 1
-       edparams $dev 'unset bootopts; unset servers; disable=inet; unset image; cdproberoot=1; unset rootdev; unset leader; leader() { echo \n--- Welcome to MINIX 3. This is the boot monitor. ---\n\nPress ESC if you need to do any special configuration.\nOtherwise I will boot with my defaults in 10 seconds.\n\n }; bootcd=1; main(){delay 10000;boot}; save' || exit
+       edparams $dev 'unset bootopts; unset servers; disable=inet; image=/boot/image/image_big; bootbig(=, Regular MINIX 3) { image=/boot/image/image ; boot } bootsmall(-, Small MINIX 3) { image=/boot/image/image_small ; boot } cdproberoot=1; unset rootdev; unset leader; leader() { echo \n--- Welcome to MINIX 3. This is the boot monitor. ---\n\nChoose an option from the menu or press ESC if you need to do anything special.\nOtherwise I will boot with my defaults in 10 seconds.\n\n }; bootcd=1; main(){trap 10000 boot; menu; }; save' || exit
 
        # copy image
        dd if=$dev of=cdfdimage bs=8192 count=180

diff --git a/tools/release.sh b/tools/release.sh
index 43265aae2e98562a870d9db4eaac8a954500cbf9..4cf7016b6a92fc605b51895bf5e5eef56b98a714 100755 (executable)
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -165,6 +165,11 @@ umount $RAM || exit
 dd if=$RAM of=$ROOTIMAGE bs=$BS count=$ROOTBLOCKS
 (cd ../boot && make)
 make image || exit 1
+cp image image_big
+make clean
+make image_small || exit 1
+# Prepare image and image_small for cdfdboot
+cp image_big image
 sh mkboot cdfdboot
 cp $IMAGE $CDFILES/bootflop.img
 cp release/cd/* $CDFILES