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

Remove /multiboot

Browse source 
This is just a duplicate of /boot/.temp, and it is not used anymore.

Change-Id: I8a4d6e68829de3ff3628ff0fe15f6d1d0a6b128f
This commit is contained in:
Lionel Sambuc 2014-07-29 17:07:15 +02:00
parent 433d6423c3
commit 84bb300f88
7 changed files with 4 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
distrib/sets/lists/minix/md.evbarm
View file

@ -7,11 +7,6 @@
./etc/rc.capes/BB-BONE-WTHR-01 minix-sys ./etc/rc.capes/BB-BONE-WTHR-01 minix-sys
./etc/system.conf.d/lan8710a minix-sys ./etc/system.conf.d/lan8710a minix-sys
./etc/system.conf.d/usbd minix-sys ./etc/system.conf.d/usbd minix-sys
./multiboot/mod07_tty minix-sys
./multiboot/mod08_mfs minix-sys
./multiboot/mod09_vm minix-sys
./multiboot/mod10_pfs minix-sys
./multiboot/mod11_init minix-sys
./sbin/gpio minix-sys ./sbin/gpio minix-sys
./usr/bin/eepromread minix-sys ./usr/bin/eepromread minix-sys
./usr/include/arm minix-sys ./usr/include/arm minix-sys

5
distrib/sets/lists/minix/md.i386
View file

@ -11,11 +11,6 @@
./etc/system.conf.d/rtl8139 minix-sys ./etc/system.conf.d/rtl8139 minix-sys
./etc/system.conf.d/rtl8169 minix-sys ./etc/system.conf.d/rtl8169 minix-sys
./etc/system.conf.d/virtio_net minix-sys ./etc/system.conf.d/virtio_net minix-sys
./multiboot/mod07_tty minix-sys
./multiboot/mod08_mfs minix-sys
./multiboot/mod09_vm minix-sys
./multiboot/mod10_pfs minix-sys
./multiboot/mod11_init minix-sys
./sbin/ahci minix-sys ./sbin/ahci minix-sys
./sbin/at_wini minix-sys ./sbin/at_wini minix-sys
./sbin/floppy minix-sys ./sbin/floppy minix-sys

8
distrib/sets/lists/minix/mi
View file

@ -124,14 +124,6 @@
./home/bin/.profile minix-sys ./home/bin/.profile minix-sys
./lib minix-sys ./lib minix-sys
./mnt minix-sys ./mnt minix-sys
./multiboot minix-sys
./multiboot/kernel minix-sys
./multiboot/mod01_ds minix-sys
./multiboot/mod02_rs minix-sys
./multiboot/mod03_pm minix-sys
./multiboot/mod04_sched minix-sys
./multiboot/mod05_vfs minix-sys
./multiboot/mod06_memory minix-sys
./proc minix-sys ./proc minix-sys
./root minix-sys ./root minix-sys
./root/.exrc minix-sys ./root/.exrc minix-sys

2
minix/commands/setup/setup.sh
View file

@ -731,7 +731,7 @@ cp /usr/mdec/boot_monitor /mnt/
minixdir=/mnt/boot/minix_default minixdir=/mnt/boot/minix_default
if [ ! -f $minixdir/kernel ] if [ ! -f $minixdir/kernel ]
then rm -rf $minixdir then rm -rf $minixdir
cp -r /mnt/multiboot $minixdir cp -r /mnt/boot/minix/.temp $minixdir
fi fi
if [ ! -e /mnt/boot/minix_latest ] if [ ! -e /mnt/boot/minix_latest ]
then ln -sf minix_default /mnt/boot/minix_latest then ln -sf minix_default /mnt/boot/minix_latest

2
minix/llvm/clientctl
View file

@ -104,7 +104,7 @@ case "$mode" in
opts="$opts -nographic" opts="$opts -nographic"
append="$append console=tty00" append="$append console=tty00"
fi fi
(cd ../../../obj.i386/destdir.i386/multiboot && $HYPER -kernel kernel -append "$append" $opts -initrd "mod01_ds,mod02_rs,mod03_pm,mod04_sched,mod05_vfs,mod06_memory,mod07_tty,mod08_mfs,mod09_vm,mod10_pfs,mod11_init") (cd ../../../obj.i386/destdir.i386/boot/minix/.temp && $HYPER -kernel kernel -append "$append" $opts -initrd "mod01_ds,mod02_rs,mod03_pm,mod04_sched,mod05_vfs,mod06_memory,mod07_tty,mod08_mfs,mod09_vm,mod10_pfs,mod11_init")
;; ;;
*) *)
echo "Invalid action: $mode" echo "Invalid action: $mode"

5
releasetools/Makefile
View file

@ -98,15 +98,12 @@ do-hdboot:
${INSTALL_FILE} $$i $$newname; \ ${INSTALL_FILE} $$i $$newname; \
echo ${INSTALL_FILE} $$i $$newname; \ echo ${INSTALL_FILE} $$i $$newname; \
done done
@cp ${PROGROOT}/minix/kernel/kernel ${DESTDIR}/boot/minix/.temp/ @${INSTALL_FILE} ${KERNEL} ${DESTDIR}/boot/minix/.temp/
@if [ "${MKINSTALLBOOT:Uno}" != "no" ] ; then \ @if [ "${MKINSTALLBOOT:Uno}" != "no" ] ; then \
${STRIP} -s ${DESTDIR}/boot/minix/.temp/* ; \ ${STRIP} -s ${DESTDIR}/boot/minix/.temp/* ; \
gzip ${DESTDIR}/boot/minix/.temp/mod* ; \ gzip ${DESTDIR}/boot/minix/.temp/mod* ; \
${HOST_SH} mkboot hdboot ${DESTDIR}; \ ${HOST_SH} mkboot hdboot ${DESTDIR}; \
${HOST_SH} ../minix/commands/update_bootcfg/update_bootcfg.sh;\ ${HOST_SH} ../minix/commands/update_bootcfg/update_bootcfg.sh;\
else \
${INSTALL_DIR} ${DESTDIR}/multiboot; \
${INSTALL_FILE} ${DESTDIR}/boot/minix/.temp/* ${DESTDIR}/multiboot; \
fi fi
# download and update NetBSD reference sources. # download and update NetBSD reference sources.

2
releasetools/x86_hdimage.sh
View file

@ -13,7 +13,7 @@ set -e
: ${CREATE_IMAGE_ONLY=0} : ${CREATE_IMAGE_ONLY=0}
# Where the kernel & boot modules will be # Where the kernel & boot modules will be
MODDIR=${DESTDIR}/multiboot MODDIR=${DESTDIR}/boot/minix/.temp
# #
# Directory where to store temporary file system images # Directory where to store temporary file system images