From 20e3de8e4c62016be5fd448325257ad5342140fa Mon Sep 17 00:00:00 2001 From: Dimitar Zhekov Date: Tue, 4 May 2004 09:20:25 +0000 Subject: [PATCH] Dimitar Zhekov: changed bootdisk to try including bize if mine is not built [2004042109351131874] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2831 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- target/bootdisk/build_stage2.sh | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/target/bootdisk/build_stage2.sh b/target/bootdisk/build_stage2.sh index 927c04158..001e62478 100644 --- a/target/bootdisk/build_stage2.sh +++ b/target/bootdisk/build_stage2.sh @@ -20,7 +20,7 @@ package_map=' +00-dirtree +glibc22 +glibc23 +popt +raidtools +mdadm +dump +eject +disktype +hdparm +memtest86 +cpuburn +bonnie++ -+mine -termcap +ncurses +-mine -bize -termcap +ncurses +readline -strace -ltrace -perl5 -m4 -time -gettext -zlib +bash +attr +acl +findutils @@ -40,7 +40,13 @@ package_map=' +00-dirtree +glibc22 +glibc23 +sysfiles +libpcap +iptables +tcp_wrappers -kiss +kbd -syslinux +ntfsprogs' -package_map="+$ROCKCFG_DEFAULT_KERNEL $package_map" +if [ -f ../../pkgs/bize.tar.bz2 -a ! -f ../../pkgs/mine.tar.bz2 ] ; then + packager=bize +else + packager=mine +fi + +package_map="+$ROCKCFG_DEFAULT_KERNEL +$packager $package_map" echo_status "Extracting the packages archives." for x in $( ls ../../pkgs/*.tar.bz2 | tr . / | cut -f8 -d/ ) @@ -102,7 +108,7 @@ ln -s bin sbin ; ln -s . usr # -progs="agetty bash cat cp date dd df ifconfig ln ls mine mkdir mke2fs \ +progs="agetty bash cat cp date dd df ifconfig ln ls $packager mkdir mke2fs \ mkswap mount mv rm reboot route sleep swapoff swapon sync umount \ eject chmod chroot grep halt rmdir sh shutdown uname killall5 \ stone mktemp sort fold sed mkreiserfs cut head tail disktype" @@ -113,6 +119,10 @@ if [ $arch = ppc ] ; then progs="$progs mac-fdisk pdisk" fi +if [ $packager = bize ] ; then + progs="$progs bzip2 md5sum" +fi + echo_status "Copy the most important programs ..." for x in $progs ; do fn=""