From 1986fbbbdb7916a8f5be6edd98edb6ab066fc723 Mon Sep 17 00:00:00 2001 From: hackbard Date: Sun, 31 Jul 2005 22:48:45 +0000 Subject: [PATCH] updated early stage3 packages + fixed creation of binaries --- doc/CHANGELOG | 7 ++++- packages/base/glibc/glibc | 2 +- packages/hackbard/cdrtools/cdrtools | 4 +-- packages/hackbard/cdrtools/u8.patch | 15 ----------- packages/hackbard/curl/curl | 4 +-- packages/hackbard/hdparm/hdparm | 4 +-- packages/hackbard/hdparm/readahead.patch | 31 ----------------------- packages/hackbard/libieee1284/libieee1284 | 6 ++--- packages/hackbard/ltrace/ltrace | 6 ++--- packages/hackbard/mhonarc/mhonarc | 4 +-- packages/hackbard/parted/parted | 4 +-- packages/hackbard/pcmcia-cs/pcmcia-cs | 2 +- packages/hackbard/rsync/rsync | 4 +-- packages/hackbard/slmodem/slmodem | 16 ++++++------ packages/hackbard/strace/strace | 6 ++--- packages/hackbard/unzip/unzip | 4 +-- packages/hackbard/zip/zip | 4 +-- packages/ia32/bootdisk/bootdisk | 5 ++-- packages/net/bridge-utils/bridge-utils | 4 +-- scripts/Create-Binary | 7 ++--- 20 files changed, 50 insertions(+), 89 deletions(-) delete mode 100644 packages/hackbard/cdrtools/u8.patch delete mode 100644 packages/hackbard/hdparm/readahead.patch diff --git a/doc/CHANGELOG b/doc/CHANGELOG index b8b7cbc..64ef4b7 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,4 +1,9 @@ -*) 2005-08-31 +*) 2005-08-1 + +- updated some early stage3 packages +- small fix in binary creation script + +*) 2005-07-31 - fixed base packages (not bootdisks!) diff --git a/packages/base/glibc/glibc b/packages/base/glibc/glibc index 71d194e..c47473c 100644 --- a/packages/base/glibc/glibc +++ b/packages/base/glibc/glibc @@ -8,7 +8,7 @@ # [D] glibc-linuxthreads-2.3.5.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/ kernver=`grep '^#\ \[V\]' $confdir/../linux/linux | awk '{ print $3 }'` -kernver=`echo $kernver | awk -F. '{ print $1 "." $2 }'` +kernver=`echo $kernver | awk -F. '{ print $1 "." $2 }'` extraver="-${ver}" [ "$ver" = "cvs" ] && extraver="" diff --git a/packages/hackbard/cdrtools/cdrtools b/packages/hackbard/cdrtools/cdrtools index 59dd0ec..8de32cf 100644 --- a/packages/hackbard/cdrtools/cdrtools +++ b/packages/hackbard/cdrtools/cdrtools @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 2.01a36 +# [V] 2.01 # [S] 3-1 -# [D] cdrtools-2.01a36.tar.bz2 ftp://ftp.berlios.de/pub/cdrecord/alpha/ +# [D] cdrtools-2.01.tar.bz2 ftp://ftp.berlios.de/pub/cdrecord/ make_conf="$make_conf INS_BASE=$prefix DEFINSUSR=root DEFINSGRP=root" install_conf="$install_conf INS_BASE=$prefix DEFINSUSR=root DEFINSGRP=root" diff --git a/packages/hackbard/cdrtools/u8.patch b/packages/hackbard/cdrtools/u8.patch deleted file mode 100644 index 5d39f47..0000000 --- a/packages/hackbard/cdrtools/u8.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ./libscg/scsi-linux-sg.c.orig 2004-08-13 14:21:18.092637976 +0200 -+++ ./libscg/scsi-linux-sg.c 2004-08-13 14:23:28.209857152 +0200 -@@ -65,6 +65,12 @@ - - #if LINUX_VERSION_CODE >= 0x01031a /* introduced in 1.3.26 */ - #if LINUX_VERSION_CODE >= 0x020000 /* introduced somewhere. */ -+#if LINUX_VERSION_CODE >= 0x020600 /* header changes for kernel >= 2.6 */ -+#define __KERNEL__ -+#include -+#include -+#undef __KERNEL__ -+#endif - /* Need to fine tune the ifdef so we get the transition point right. */ - #include - #else diff --git a/packages/hackbard/curl/curl b/packages/hackbard/curl/curl index 3511036..209e582 100644 --- a/packages/hackbard/curl/curl +++ b/packages/hackbard/curl/curl @@ -2,6 +2,6 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 7.12.0 +# [V] 7.14.0 # [S] 3-1 -# [D] curl-7.12.0.tar.bz2 http://curl.haxx.se/download/ +# [D] curl-7.14.0.tar.bz2 http://curl.haxx.se/download/ diff --git a/packages/hackbard/hdparm/hdparm b/packages/hackbard/hdparm/hdparm index f413607..0817894 100644 --- a/packages/hackbard/hdparm/hdparm +++ b/packages/hackbard/hdparm/hdparm @@ -2,6 +2,6 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 5.5 +# [V] 6.1 # [S] 3-1 -# [D] hdparm-5.5.tar.gz http://www.ibiblio.org/pub/Linux/system/hardware/ +# [D] hdparm-6.1.tar.gz http://www.ibiblio.org/pub/Linux/system/hardware/ diff --git a/packages/hackbard/hdparm/readahead.patch b/packages/hackbard/hdparm/readahead.patch deleted file mode 100644 index 9158a3f..0000000 --- a/packages/hackbard/hdparm/readahead.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- ./hdparm.c.orig 2004-07-14 14:31:02.000000000 +0200 -+++ ./hdparm.c 2004-07-14 14:37:11.000000000 +0200 -@@ -52,7 +52,7 @@ - static int flagcount = 0, do_flush = 0, is_scsi_hd = 0, is_scsi_cd = 0, is_xt_hd = 0; - static int do_ctimings, do_timings = 0; - --static unsigned long set_readahead= 0, get_readahead= 0, readahead= 0; -+static unsigned long set_readahead= 0, get_readahead= 0, my_readahead= 0; - static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0; - static unsigned long set_unmask = 0, get_unmask = 0, unmask = 0; - static unsigned long set_mult = 0, get_mult = 0, mult = 0; -@@ -784,8 +784,8 @@ - - if (set_readahead) { - if (get_readahead) -- printf(" setting fs readahead to %ld\n", readahead); -- if (ioctl(fd, BLKRASET, readahead)) -+ printf(" setting fs readahead to %ld\n", my_readahead); -+ if (ioctl(fd, BLKRASET, my_readahead)) - perror(" BLKRASET failed"); - } - #ifdef HDIO_UNREGISTER_HWIF -@@ -1829,7 +1829,7 @@ - case 'a': - get_readahead = noisy; - noisy = 1; -- GET_NUMBER(set_readahead,readahead); -+ GET_NUMBER(set_readahead,my_readahead); - break; - case 'B': - get_apmmode = noisy; diff --git a/packages/hackbard/libieee1284/libieee1284 b/packages/hackbard/libieee1284/libieee1284 index 20b8ab0..21b6be5 100644 --- a/packages/hackbard/libieee1284/libieee1284 +++ b/packages/hackbard/libieee1284/libieee1284 @@ -2,6 +2,6 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 0.2.9pre2 -# [S] 3-1 -# [D] libieee1284-0.2.9pre2.tar.bz2 http://cyberelk.net/tim/data/libieee1284/stable/ +# [V] 0.2.10 +# [S] 3-3 +# [D] libieee1284-0.2.10.tar.bz2 http://cyberelk.net/tim/data/libieee1284/stable/ diff --git a/packages/hackbard/ltrace/ltrace b/packages/hackbard/ltrace/ltrace index 04b1fb9..efd9500 100644 --- a/packages/hackbard/ltrace/ltrace +++ b/packages/hackbard/ltrace/ltrace @@ -2,8 +2,8 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 0.3.34 +# [V] 0.3.36.orig # [S] 3-1 -# [D] ltrace_0.3.34.tar.gz ftp://ftp.debian.org/debian/pool/main/l/ltrace/ +# [D] ltrace_0.3.36.orig.tar.gz ftp://ftp.debian.org/debian/pool/main/l/ltrace/ -confopt="--prefix=$root/usr" +#confopt="--prefix=$root/usr" diff --git a/packages/hackbard/mhonarc/mhonarc b/packages/hackbard/mhonarc/mhonarc index cb49de9..170231d 100644 --- a/packages/hackbard/mhonarc/mhonarc +++ b/packages/hackbard/mhonarc/mhonarc @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 2.6.10 +# [V] 2.6.15 # [S] 3-1 -# [D] MHonArc-2.6.10.tar.bz2 http://www.mhonarc.org/tar/ +# [D] MHonArc-2.6.15.tar.bz2 http://www.mhonarc.org/release/MHonArc/tar/ # we build in opt prefix=$root/opt/mhonarc diff --git a/packages/hackbard/parted/parted b/packages/hackbard/parted/parted index 1b7fbf5..01f847b 100644 --- a/packages/hackbard/parted/parted +++ b/packages/hackbard/parted/parted @@ -2,8 +2,8 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 1.6.11 +# [V] 1.6.23 # [S] 3-1 -# [D] parted-1.6.11.tar.gz http://ftp.gnu.org/gnu/parted/ +# [D] parted-1.6.23.tar.gz http://ftp.gnu.org/gnu/parted/ confopt="$confopt --without-readline" diff --git a/packages/hackbard/pcmcia-cs/pcmcia-cs b/packages/hackbard/pcmcia-cs/pcmcia-cs index 7af08d5..4defe50 100644 --- a/packages/hackbard/pcmcia-cs/pcmcia-cs +++ b/packages/hackbard/pcmcia-cs/pcmcia-cs @@ -3,7 +3,7 @@ # author: hackbard@hackdaworld.dyndns.org # # [V] 3.2.8 -# [S] 3-1 +# [S] 3-8 # [D] pcmcia-cs-3.2.8.tar.gz http://pcmcia-cs.sourceforge.net/ftp/ pre_install() { diff --git a/packages/hackbard/rsync/rsync b/packages/hackbard/rsync/rsync index 38677b7..b7dd952 100644 --- a/packages/hackbard/rsync/rsync +++ b/packages/hackbard/rsync/rsync @@ -3,8 +3,8 @@ # author: hackbard # [S] 3-1 -# [V] 2.6.2 -# [D] rsync-2.6.2.tar.gz http://rsync.samba.org/ftp/rsync/ +# [V] 2.6.6 +# [D] rsync-2.6.6.tar.gz http://rsync.samba.org/ftp/rsync/ pre_install() { export STRIP="--strip" diff --git a/packages/hackbard/slmodem/slmodem b/packages/hackbard/slmodem/slmodem index 6dd927d..72061de 100644 --- a/packages/hackbard/slmodem/slmodem +++ b/packages/hackbard/slmodem/slmodem @@ -3,7 +3,7 @@ # author: hackbard@hackdaworld.dyndns.org # # [V] 2.9.9 -# [S] 3-1 +# [S] 3-11 # [D] slmodem-2.9.9.tar.gz http://linmodems.technion.ac.il/packages/smartlink/ pre_install() { @@ -11,10 +11,10 @@ pre_install() { cp README $docdir } -#build_main() { -# cd modem && make SUPPORT_ALSA=1 -# rm -rf $docdir -# mkdir -p $prefix/bin $docdir -# cp slmodemd modem_test $prefix/bin -# cp ../README $docdir -# } +build_main() { + cd modem && make SUPPORT_ALSA=1 KERNEL_VER=$kernver + rm -rf $docdir + mkdir -p $prefix/bin $docdir + cp slmodemd modem_test $prefix/bin + cp ../README $docdir + } diff --git a/packages/hackbard/strace/strace b/packages/hackbard/strace/strace index ba68930..b1f0ed4 100644 --- a/packages/hackbard/strace/strace +++ b/packages/hackbard/strace/strace @@ -2,8 +2,8 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 4.4.98 +# [V] 4.5.12 # [S] 3-1 -# [D] strace-4.4.98.tar.bz2 http://belnet.dl.sourceforge.net/sourceforge/strace/ +# [D] strace-4.5.12.tar.bz2 http://mesh.dl.sourceforge.net/sourceforge/strace/ -confopt="--prefix=$prefix" +#confopt="--prefix=$prefix" diff --git a/packages/hackbard/unzip/unzip b/packages/hackbard/unzip/unzip index 81bd2ac..8cd8abf 100644 --- a/packages/hackbard/unzip/unzip +++ b/packages/hackbard/unzip/unzip @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 551 +# [V] 552 # [S] 3-1 -# [D] unzip551.tar.gz ftp://ftp.info-zip.org/pub/infozip/src/ +# [D] unzip552.tar.gz ftp://ftp.info-zip.org/pub/infozip/src/ build_main() { make $make_conf generic -f unix/Makefile prefix=$prefix diff --git a/packages/hackbard/zip/zip b/packages/hackbard/zip/zip index e35bac0..836f65c 100644 --- a/packages/hackbard/zip/zip +++ b/packages/hackbard/zip/zip @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 23 +# [V] 231 # [S] 3-1 -# [D] zip23.tar.gz ftp://ftp.info-zip.org/pub/infozip/src/ +# [D] zip231.tar.gz ftp://ftp.info-zip.org/pub/infozip/src/ build_main() { make $make_conf generic -f unix/Makefile prefix=$prefix diff --git a/packages/ia32/bootdisk/bootdisk b/packages/ia32/bootdisk/bootdisk index e75e51c..706b097 100644 --- a/packages/ia32/bootdisk/bootdisk +++ b/packages/ia32/bootdisk/bootdisk @@ -7,7 +7,7 @@ # [S] 2-19 skip=1 -s_reason="bootdisks are deluxe ... (scheduled for 1.0 release ;)" +s_reason="bootdisks are deluxe ... (scheduled for 2.0 release ;)" srcdir="busybox-$ver" @@ -45,9 +45,10 @@ post_install() { cp $root/usr/bin/hdw-get mnt/bin/ cp $root/etc/hdw-get.conf mnt/etc/ # init stuff - for i in inittab init.d HOSTNAME passwd group fstab conf; do + for i in init.d HOSTNAME passwd group fstab conf; do cp -r $hdw_home_dir/misc/sysfiles/etc/$i mnt/etc/ done + cp $root/etc/inittab mnt/etc/ cp $confdir/issue mnt/etc/ # kernel cp $root/boot/vmlinuz_hdw mnt/boot diff --git a/packages/net/bridge-utils/bridge-utils b/packages/net/bridge-utils/bridge-utils index 6b12c8a..31bad66 100644 --- a/packages/net/bridge-utils/bridge-utils +++ b/packages/net/bridge-utils/bridge-utils @@ -2,6 +2,6 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 1.0.4 +# [V] 1.0.6 # [S] 3-1 -# [D] bridge-utils-1.0.4.tar.gz http://belnet.dl.sourceforge.net/sourceforge/bridge/ +# [D] bridge-utils-1.0.6.tar.gz http://mesh.dl.sourceforge.net/sourceforge/bridge/ diff --git a/scripts/Create-Binary b/scripts/Create-Binary index 3059258..8bce90a 100755 --- a/scripts/Create-Binary +++ b/scripts/Create-Binary @@ -80,14 +80,15 @@ elif [ "$package" = "all" ] ; then ((counter=0)) for pkg in `ls -A $hdw_build_dir/var/adm/flists | grep -v '.stage'`; do - tar_name=`echo $pkg | awk -F- '{ print $1 }'` + tar_name=`echo $pkg | sed "s/-[0-9].*//g"` ./scripts/Create-Binary -package $pkg -root $hdw_build_dir \ - -tar_name $tar_name + -tar-name $tar_name ((counter+=1)) done # add 00-dirtree, build in stage1 -./scripts/Create-Binary -package 00-dirtree.stage0-0 -tar-name 00-dirtree +./scripts/Create-Binary -package 00-dirtree.stage0-0 -tar-name 00-dirtree \ + -root $hdw_build_dir ((counter+=1)) echo "created $counter binaries, done" -- 2.39.2