. remove small image (doesn't fit)
. edparams line a bit more readable . use image built in build tree, not regular source tree
This commit is contained in:
parent
cd4756933a
commit
e2932a1180
3 changed files with 18 additions and 15 deletions
|
@ -10,9 +10,6 @@ rm /boot/image/*
|
|||
make install
|
||||
cp /boot/image/* /boot/image_big # Make big image accessible by this name
|
||||
cp ../boot/boot /boot/boot
|
||||
make clean
|
||||
make image_small
|
||||
cp image_small /boot
|
||||
cd /usr/src
|
||||
make clean
|
||||
# Let man find the manpages
|
||||
|
|
16
tools/mkboot
16
tools/mkboot
|
@ -183,12 +183,24 @@ cdfdboot)
|
|||
mkdir /mnt/boot
|
||||
mkdir /mnt/boot/image
|
||||
( cd /mnt/dev && sh /usr/src/commands/scripts/MAKEDEV.sh std )
|
||||
#cp -p image image_* /mnt/boot/image || exit 1
|
||||
cp -p 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; image=/boot/image/image; bootbig(1, Regular MINIX 3) { image=/boot/image/image ; boot } bootsmall(2, Small MINIX 3 (uses less memory)) { image=/boot/image/image_small ; boot } cdproberoot=1; ata_id_timeout=2; 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;
|
||||
unset rootdev;
|
||||
unset leader;
|
||||
unset image;
|
||||
disable=inet;
|
||||
bootcd=1;
|
||||
cdproberoot=1;
|
||||
ata_id_timeout=2;
|
||||
bootbig(1, Regular MINIX 3) { unset image; boot }
|
||||
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 };
|
||||
main(){trap 10000 boot; menu; };
|
||||
save' || exit
|
||||
|
||||
# copy image
|
||||
dd if=$dev of=cdfdimage bs=8192 count=180
|
||||
|
|
|
@ -51,7 +51,6 @@ bios_wini=yes
|
|||
bios_remap_first=1
|
||||
ramimagedev=c0d7p0s0
|
||||
bootbig(1, Regular MINIX 3) { image=/boot/image_big; boot }
|
||||
bootsmall(2, Small MINIX 3 (<16MB)) {image=/boot/image_small; boot }
|
||||
main() { trap 10000 boot ; menu; }
|
||||
save' | $RELEASEDIR/usr/bin/edparams $TMPDISK3
|
||||
|
||||
|
@ -326,7 +325,10 @@ if [ "$USB" -eq 0 ]
|
|||
then date >$RELEASEDIR/CD
|
||||
fi
|
||||
echo " * Chroot build"
|
||||
cp chrootmake.sh $RELEASEDIR/usr/$SRC/tools/chrootmake.sh
|
||||
chroot $RELEASEDIR "PATH=/$XBIN sh -x /usr/$SRC/tools/chrootmake.sh" || exit 1
|
||||
# Copy built images for cd booting
|
||||
cp $RELEASEDIR/boot/image_big image
|
||||
echo " * Chroot build done"
|
||||
echo " * Removing bootstrap files"
|
||||
rm -rf $RELEASEDIR/$XBIN
|
||||
|
@ -359,17 +361,9 @@ rm $RELEASEDIR/.x
|
|||
umount $TMPDISK || exit
|
||||
umount $TMPDISK2 || exit
|
||||
umount $TMPDISK3 || exit
|
||||
|
||||
(cd ../boot && make)
|
||||
(cd .. && make depend)
|
||||
make clean
|
||||
SVNVAR=EXTRA_OPTS=-D_SVN_REVISION='\\\"'$REVISION'\\\"'
|
||||
make "$SVNVAR" image || exit 1
|
||||
mv image image_big
|
||||
make clean
|
||||
make "$SVNVAR" image_small || exit 1
|
||||
dd if=$TMPDISK3 of=$ROOTIMAGE bs=$BS count=$ROOTBLOCKS
|
||||
# Prepare image and image_small for cdfdboot
|
||||
mv image_big image
|
||||
sh mkboot cdfdboot $TMPDISK3
|
||||
cp $IMAGE $CDFILES/bootflop.img
|
||||
cp release/cd/* $CDFILES || true
|
||||
|
|
Loading…
Reference in a new issue