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

Don't choose FS by labels after all.

Browse source
This commit is contained in:
Ben Gras 2006-03-13 08:47:05 +00:00
parent ef077116b1
commit acdac1ec92
3 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tools/Makefile
View file

@ -4,7 +4,7 @@ u=/usr
CC= exec cc
CFLAGS= -O -D_MINIX -D_POSIX_SOURCE
MDEC= /usr/mdec
MAKE= make -$(MAKEFLAGS)
MAKE= exec make -$(MAKEFLAGS)
# Specify the programs that are part of the system image.
# Multiple boot medium drivers can be included in the image,
@ -12,8 +12,7 @@ MAKE= make -$(MAKEFLAGS)
# determined by the 'label=...' boot monitor parameter.
PROGRAMS= ../kernel/kernel \
../servers/pm/pm \
BIG:../servers/fs/fs \
SMALL:../servers/fs/smallfs \
../servers/fs/fs \
../servers/rs/rs \
../servers/ds/ds \
../drivers/tty/tty \
@ -54,12 +53,16 @@ all: services image
image: includes
cd ../kernel && $(MAKE)
cd ../servers/fs && $(MAKE) EXTRA_OPTS=-D_MINIX_SMALL=1 clean fs && \
mv fs smallfs && make clean
cd ../servers && $(MAKE) image
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:
cd ../include && $(MAKE) install
@ -97,5 +100,5 @@ clean:
cd ../kernel && $(MAKE) $@
cd ../servers && $(MAKE) $@
cd ../drivers && $(MAKE) $@
rm -rf *.bak image *.iso *.iso.gz cdfdimage rootimage src
rm -rf *.bak image image_small *.iso *.iso.gz cdfdimage rootimage src

4
tools/mkboot
View file

@ -182,11 +182,11 @@ cdfdboot)
mkdir /mnt/boot
mkdir /mnt/boot/image
( cd /mnt/dev && sh /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; image=/boot/image/image; bootbig(1, Regular MINIX 3 (requires at least 16 MB RAM)) { label=BIG ; boot } bootsmall(2, Small MINIX 3 (intended for 8 MB systems)) { label=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 (requires at least 16 MB RAM)) { image=/boot/image/image ; boot } bootsmall(2, Small MINIX 3 (intended for 8 MB systems)) { 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

4
tools/release.sh
View file

@ -42,8 +42,8 @@ hdemu_root_changes()
disable=inet
bios_remap_first=1
ramimagedev=c0d7p0s0
bootbig(1, Regular MINIX 3) { label=BIG; boot }
bootsmall(2, Small MINIX 3 (<16MB)) {label=SMALL; boot }
bootbig(1, Regular MINIX 3) { unset image; boot }
bootsmall(2, Small MINIX 3 (<16MB)) {image=/boot/image/image_small; boot }
main() { trap 10000 boot ; menu; }
save' | $RELEASEDIR/usr/bin/edparams $TMPDISK3