mkboot: numbers, not letters

release: make sure compilers are bin-owned for chmems

diff --git a/tools/mkboot b/tools/mkboot
index f4382a1fbf50f9094a12aac7d95e71f22f2fb8b0..246a4bf937e87406466818f2b09d2bd679614039 100755 (executable)
--- a/tools/mkboot
+++ b/tools/mkboot
@@ -174,7 +174,7 @@ cdfdboot)
        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; 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
+       edparams $dev 'unset bootopts; unset servers; disable=inet; image=/boot/image/image_big; bootbig(1, Regular MINIX 3) { image=/boot/image/image ; boot } bootsmall(2, 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 26aae8b588ebcf2fc8605a5802786bc5a2eb0259..5a9d373e97be3f727b8d9acf9d8943305c41a89b 100755 (executable)
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -151,6 +151,9 @@ mkdir -p $RELEASEDIR/usr/tmp
 echo " * Transfering $COPYITEMS to $RELEASEDIR"
 ( cd / && tar cf - $COPYITEMS ) | ( cd $RELEASEDIR && tar xf - ) || exit 1
 
+# Make sure compilers and libraries are bin-owned
+chown -R bin $RELEASEDIR/usr/lib
+
 if [ "$COPY" -ne 1 ]
 then
        echo " * Doing new cvs export"