From 84bb300f88ee0498f6caa0f229247b413e3d4217 Mon Sep 17 00:00:00 2001 From: Lionel Sambuc Date: Tue, 29 Jul 2014 17:07:15 +0200 Subject: [PATCH] Remove /multiboot This is just a duplicate of /boot/.temp, and it is not used anymore. Change-Id: I8a4d6e68829de3ff3628ff0fe15f6d1d0a6b128f --- distrib/sets/lists/minix/md.evbarm | 5 ----- distrib/sets/lists/minix/md.i386 | 5 ----- distrib/sets/lists/minix/mi | 8 -------- minix/commands/setup/setup.sh | 2 +- minix/llvm/clientctl | 2 +- releasetools/Makefile | 5 +---- releasetools/x86_hdimage.sh | 2 +- 7 files changed, 4 insertions(+), 25 deletions(-) diff --git a/distrib/sets/lists/minix/md.evbarm b/distrib/sets/lists/minix/md.evbarm index ac92adfa0..0e555535e 100644 --- a/distrib/sets/lists/minix/md.evbarm +++ b/distrib/sets/lists/minix/md.evbarm @@ -7,11 +7,6 @@ ./etc/rc.capes/BB-BONE-WTHR-01 minix-sys ./etc/system.conf.d/lan8710a 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 ./usr/bin/eepromread minix-sys ./usr/include/arm minix-sys diff --git a/distrib/sets/lists/minix/md.i386 b/distrib/sets/lists/minix/md.i386 index 3b9929699..46e01d690 100644 --- a/distrib/sets/lists/minix/md.i386 +++ b/distrib/sets/lists/minix/md.i386 @@ -11,11 +11,6 @@ ./etc/system.conf.d/rtl8139 minix-sys ./etc/system.conf.d/rtl8169 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/at_wini minix-sys ./sbin/floppy minix-sys diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi index 414e95fad..01e913681 100644 --- a/distrib/sets/lists/minix/mi +++ b/distrib/sets/lists/minix/mi @@ -124,14 +124,6 @@ ./home/bin/.profile minix-sys ./lib 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 ./root minix-sys ./root/.exrc minix-sys diff --git a/minix/commands/setup/setup.sh b/minix/commands/setup/setup.sh index 192d04abf..0ff3715c1 100644 --- a/minix/commands/setup/setup.sh +++ b/minix/commands/setup/setup.sh @@ -731,7 +731,7 @@ cp /usr/mdec/boot_monitor /mnt/ minixdir=/mnt/boot/minix_default if [ ! -f $minixdir/kernel ] then rm -rf $minixdir - cp -r /mnt/multiboot $minixdir + cp -r /mnt/boot/minix/.temp $minixdir fi if [ ! -e /mnt/boot/minix_latest ] then ln -sf minix_default /mnt/boot/minix_latest diff --git a/minix/llvm/clientctl b/minix/llvm/clientctl index e47552799..42fbf1607 100755 --- a/minix/llvm/clientctl +++ b/minix/llvm/clientctl @@ -104,7 +104,7 @@ case "$mode" in opts="$opts -nographic" append="$append console=tty00" 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" diff --git a/releasetools/Makefile b/releasetools/Makefile index 6c4ec8c28..6ee676168 100644 --- a/releasetools/Makefile +++ b/releasetools/Makefile @@ -98,15 +98,12 @@ do-hdboot: ${INSTALL_FILE} $$i $$newname; \ echo ${INSTALL_FILE} $$i $$newname; \ done - @cp ${PROGROOT}/minix/kernel/kernel ${DESTDIR}/boot/minix/.temp/ + @${INSTALL_FILE} ${KERNEL} ${DESTDIR}/boot/minix/.temp/ @if [ "${MKINSTALLBOOT:Uno}" != "no" ] ; then \ ${STRIP} -s ${DESTDIR}/boot/minix/.temp/* ; \ gzip ${DESTDIR}/boot/minix/.temp/mod* ; \ ${HOST_SH} mkboot hdboot ${DESTDIR}; \ ${HOST_SH} ../minix/commands/update_bootcfg/update_bootcfg.sh;\ - else \ - ${INSTALL_DIR} ${DESTDIR}/multiboot; \ - ${INSTALL_FILE} ${DESTDIR}/boot/minix/.temp/* ${DESTDIR}/multiboot; \ fi # download and update NetBSD reference sources. diff --git a/releasetools/x86_hdimage.sh b/releasetools/x86_hdimage.sh index 84759eee8..c08e928a3 100755 --- a/releasetools/x86_hdimage.sh +++ b/releasetools/x86_hdimage.sh @@ -13,7 +13,7 @@ set -e : ${CREATE_IMAGE_ONLY=0} # Where the kernel & boot modules will be -MODDIR=${DESTDIR}/multiboot +MODDIR=${DESTDIR}/boot/minix/.temp # # Directory where to store temporary file system images -- 2.44.0