diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index d8a7499b7..5b27d83dc 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -1,4 +1,8 @@ +*) 2003-08-20 (2.0.0-camp - 2.0.0-rc1) + + - fixed bootdisk and strip wrapper useage + *) 2003-08-19 (2.0.0-camp - 2.0.0-rc1) - Benjamin Schieder: gpsdrive diff --git a/target/bootdisk/build_stage1.sh b/target/bootdisk/build_stage1.sh index e048aedaa..9360a6b7d 100644 --- a/target/bootdisk/build_stage1.sh +++ b/target/bootdisk/build_stage1.sh @@ -1,4 +1,6 @@ +set | grep STRIP + echo_header "Creating initrd data:" rm -rf $disksdir/initrd mkdir -p $disksdir/initrd/{dev,proc,tmp,scsi,net,bin} @@ -30,9 +32,9 @@ done # echo_status "Copy scsi and network kernel modules." for x in ../2nd_stage/lib/modules/*/kernel/drivers/{scsi,net}/*.o; do - mkdir -p $( dirname ${x#../2nd_stage/} ) - cp $x ${x#../2nd_stage/} - strip --strip-debug --strip-unneeded ${x#../2nd_stage/} + xx=${x#../2nd_stage/} + mkdir -p $( dirname $xx ) ; cp $x $xx + strip $xx # --strip-debug --strip-unneeded $xx done cp ../2nd_stage/lib/modules/*/modules.dep lib/modules/[0-9]*/ cp ../2nd_stage/lib/modules/*/modules.pcimap lib/modules/[0-9]*/ @@ -45,7 +47,7 @@ rm -f lib/modules/[0-9]*/kernel/drivers/net/{dummy,ppp*}.o # if [ "$ROCKCFG_BOOTDISK_USEKISS" = 1 ]; then echo_status "Adding kiss shell for expert use of the initrd image." - cp $root/bin/kiss bin/ + cp $build_dir/root/bin/kiss bin/ #mv linuxrc bin/; ln -s bin/kiss linuxrc #rm -f lib/modules/[0-9]*/kernel/drivers/net/{dgrx,acenic}.o #rm -f lib/modules/[0-9]*/kernel/drivers/scsi/{advansys,qla1280}.o diff --git a/target/bootdisk/build_stage2.sh b/target/bootdisk/build_stage2.sh index 5e3f05099..dbd25b06f 100644 --- a/target/bootdisk/build_stage2.sh +++ b/target/bootdisk/build_stage2.sh @@ -33,7 +33,8 @@ package_map=' +00-dirtree +glibc22 +glibc23 +modutils +pciutils -cron +portmap +sysklogd +devfsd +setserial +iproute2 +netkit-base +netkit-ftp +netkit-telnet +netkit-tftp -+sysfiles +libpcap +iptables +tcp_wrappers' ++sysfiles +libpcap +iptables +tcp_wrappers +-kiss' package_map="+$ROCKCFG_DEFAULT_KERNEL $package_map" diff --git a/target/bootdisk/pkg_modutils.conf b/target/bootdisk/pkg_modutils.conf new file mode 100644 index 000000000..d9ee0fd2e --- /dev/null +++ b/target/bootdisk/pkg_modutils.conf @@ -0,0 +1,6 @@ + +[ -e $confdir/$pkg.conf ] && . $confdir/$pkg.conf + +var_append confopt " " "--disable-combined --enable-combined-rmmod \ + --enable-combined-modprobe" + diff --git a/target/bootdisk/pkg_wget.conf b/target/bootdisk/pkg_wget.conf new file mode 100644 index 000000000..2c173d580 --- /dev/null +++ b/target/bootdisk/pkg_wget.conf @@ -0,0 +1,5 @@ + +[ -e $confdir/$pkg.conf ] && . $confdir/$pkg.conf + +var_append confopt " " "--without-ssl --disable-opie --disable-digest" +