some more adaptions ...

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index f7d6259d5505b6d5c75b659850607aef59e8ec3f..967dd9aeae676b42a90301084decf5e188cb731b 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,6 +1,10 @@
+*) 2005-05-14
+
+- some more adaptions
+
 *) 2005-05-13
 
-- changes major scripts improving toolchain and crossbuild concept (devel)
+- changes to major scripts improving toolchain and crossbuild concept (devel)
 
 *) 2005-05-03
 

diff --git a/packages/base/binutils/binutils b/packages/base/binutils/binutils
index c4e77f213fff2e2d387ec2591b6539b148a82eb8..c3ee80ed147dbf8a53b992919a8ae1cdd75e826c 100644 (file)
--- a/packages/base/binutils/binutils
+++ b/packages/base/binutils/binutils
@@ -2,11 +2,9 @@
 
 # author: hackbard@hackdaworld.dyndns.org
 #
-## [V] 2.15
-# [V] 2.15.91.0.1
+# [V] 2.16.90.0.3
 # [S] 2-4 2-5
-## [D] binutils-2.15.tar.bz2 ftp://ftp.gnu.org/gnu/binutils/
-# [D] binutils-2.15.91.0.1.tar.bz2 http://ftp.kernel.org/pub/linux/devel/binutils/
+# [D] binutils-2.16.90.0.3.tar.bz2 http://ftp.kernel.org/pub/linux/devel/binutils/
 
 libpath="/usr/lib:/lib"
 

diff --git a/packages/base/gcc/gcc b/packages/base/gcc/gcc
index 2f96fca6affdd94afeb40b63c2ff2c9568010417..0b5c83eaa702ab96211adceffd881639aece91a3 100644 (file)
--- a/packages/base/gcc/gcc
+++ b/packages/base/gcc/gcc
@@ -2,11 +2,11 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 3.3.4
+# [V] 4.0.0
 # [S] 2-5
-# [D] gcc-3.3.4.tar.bz2 ftp://ftp.fu-berlin.de/unix/gnu/gcc/gcc-3.3.4/
-# [D] gcc-g++-3.3.4.tar.bz2 ftp://ftp.fu-berlin.de/unix/gnu/gcc/gcc-3.3.4/
-# [D] gcc-g77-3.3.4.tar.bz2 ftp://ftp.fu-berlin.de/unix/gnu/gcc/gcc-3.3.4/
+# [D] gcc-4.0.0.tar.bz2 ftp://ftp.fu-berlin.de/unix/gnu/gcc/gcc-4.0.0/
+# [D] gcc-g++-4.0.0.tar.bz2 ftp://ftp.fu-berlin.de/unix/gnu/gcc/gcc-4.0.0/
+# [D] gcc-g77-4.0.0.tar.bz2 ftp://ftp.fu-berlin.de/unix/gnu/gcc/gcc-4.0.0/
 
 extraver="-${ver}"
 [ "$ver" = "cvs" ] && extraver=""
@@ -20,8 +20,8 @@ confopt="$confopt --libexecdir=$prefix/lib"
 
 pre_install()  {
        echo "extracting c++ and fortran sources ..."
-       tar --use-compress-program=$compress -xvf $archdir/gcc-g++-3.3.4.tar.bz2
-       tar --use-compress-program=$compress -xvf $archdir/gcc-g77-3.3.4.tar.bz2
+       tar --use-compress-program=$compress -xvf $archdir/gcc-g++-$ver.tar.bz2
+       tar --use-compress-program=$compress -xvf $archdir/gcc-g77-$ver.tar.bz2
        echo "patching source (libiberty) ..."
        mv ./libiberty/Makefile.in ./tmp~
        sed 's%install_to_$(INSTALL_DEST) %%' ./tmp~ > ./libiberty/Makefile.in

diff --git a/packages/base/glibc/glibc b/packages/base/glibc/glibc
index 9f78d6ac18afecf07e9125db50be5211a29f49ea..fd676f884e0d6afeeac3097bf0239d073e533ea7 100644 (file)
--- a/packages/base/glibc/glibc
+++ b/packages/base/glibc/glibc
@@ -2,24 +2,25 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] cvs
+# [V] 2.3.5
 # [S] 2-3
-## [D] glibc-2.3.2.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/
-# [D] glibc.tar.bz2 cvs:anoncvs:sources.redhat.com:cvs/glibc:libc
+# [D] glibc-2.3.5.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/
+# [D] glibc-linuxthreads-2.3.5.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/
 
 srcdir=libc
+kernver=`grep '^#\ \[V\]' $confdir/../linux/linux | awk '{ print $3 }'`
 extraver="-${ver}"
 [ "$ver" = "cvs" ] && extraver=""
 
-confopt="$confopt --enable-add-ons=nptl --disable-profile --with-tls"
-confopt="$confopt --libexecdir=$root/tmp/pt_chown --without-cvs"
-confopt="$confopt --with-headers=/${s1_prefix}/glibc-kernheaders"
+confopt="$confopt --enable-add-ons --disable-profile"
+confopt="$confopt --libexecdir=$prefix/lib/glibc --without-cvs"
+confopt="$confopt --enable-kernel=$kernver"
 
 pre_install()  {
        echo "creating some files needed for build ..."
        mkdir -p $prefix/etc
        [ ! -f $root/etc/ld.so.conf ] && touch $root/etc/ld.so.conf
-       [ ! -c /dev/null ] && mknod -m 0666 /dev/null c 1 3
+       [ ! -c $root/dev/null ] && mknod -m 0666 $root/dev/null c 1 3
        echo "done (file creating)"
                }
 

diff --git a/packages/base/linux-libc-headers/linux-libc-headers b/packages/base/linux-libc-headers/linux-libc-headers
index d7d812a4c5681fc8915bc63d6b382d210fe29ace..bafc5882e28dc03dfc8f734058c00d6dba4085bd 100644 (file)
--- a/packages/base/linux-libc-headers/linux-libc-headers
+++ b/packages/base/linux-libc-headers/linux-libc-headers
@@ -2,9 +2,9 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 2.6.7.0
+# [V] 2.6.11.2
 # [S] 2-2
-# [D] linux-libc-headers-2.6.7.0.tar.bz2 http://ep09.pld-linux.org/~mmazur/linux-libc-headers/
+# [D] linux-libc-headers-2.6.11.2.tar.bz2 http://ep09.pld-linux.org/~mmazur/linux-libc-headers/
 
 arch=${hdw_arch//ia32/i386}
 

diff --git a/packages/base/linux/linux b/packages/base/linux/linux
index ff90dd5546610c28a3c778a45e99843782df960d..79aebf7c0431a290dff8af521e3016b29887d5fd 100644 (file)
--- a/packages/base/linux/linux
+++ b/packages/base/linux/linux
@@ -2,9 +2,9 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 2.6.11.7
+# [V] 2.6.11.9
 # [S] 2-2
-# [D] linux-2.6.11.7.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/
+# [D] linux-2.6.11.9.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/
 
 custmain="1"
 custmain()     {

diff --git a/packages/toolchain/binutils/binutils b/packages/toolchain/binutils/binutils
index 82ea44d586eab7b9518b2f2104a137362fedd93f..559ba958842e145be3ce71dc2a7f45636957194e 100644 (file)
--- a/packages/toolchain/binutils/binutils
+++ b/packages/toolchain/binutils/binutils
@@ -2,9 +2,9 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 2.15.91.0.1
+# [V] 2.16.90.0.3
 # [S] 0-1 0-4 0-5
-# [D] binutils-2.15.91.0.1.tar.bz2 http://ftp.kernel.org/pub/linux/devel/binutils/
+# [D] binutils-2.16.90.0.3.tar.bz2 http://ftp.kernel.org/pub/linux/devel/binutils/
 
 if [ "$priority" = "1" ] ; then
        confopt="$confopt --disable-nls"

diff --git a/packages/toolchain/gcc/gcc b/packages/toolchain/gcc/gcc
index 39e2b24aea29ade6b54bad8d44ad9c287b26fdef..3b4fea697db61048c31e952a3c9bb5cc0611d2ac 100644 (file)
--- a/packages/toolchain/gcc/gcc
+++ b/packages/toolchain/gcc/gcc
@@ -2,9 +2,9 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 3.3.4
+# [V] 4.0.0
 # [S] 0-1 0-4
-# [D] gcc-3.3.4.tar.bz2 ftp://ftp.fu-berlin.de/unix/gnu/gcc/gcc-3.3.4/
+# [D] gcc-4.0.0.tar.bz2 ftp://ftp.fu-berlin.de/unix/gnu/gcc/gcc-4.0.0/
 
 
 extraver="-$ver"

diff --git a/packages/toolchain/glibc/glibc b/packages/toolchain/glibc/glibc
index 7653346b7976439e9a68e2f28ec942cf63cdb100..d280d17f9da74d000503d1907e36be92da6b2429 100644 (file)
--- a/packages/toolchain/glibc/glibc
+++ b/packages/toolchain/glibc/glibc
@@ -2,20 +2,20 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] cvs
+# [V] 2.3.5
 # [S] 0-3
-## [D] glibc-2.3.2.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/
-## [D] glibc-linuxthreads-2.3.2.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/
-# [D] glibc.tar.bz2 cvs:anoncvs:sources.redhat.com:cvs/glibc:libc
+# [D] glibc-2.3.5.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/
+# [D] glibc-linuxthreads-2.3.5.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/
+## [D] glibc.tar.bz2 cvs:anoncvs:sources.redhat.com:cvs/glibc:libc
 
 srcdir=libc
+kernver=`grep '^#\ \[V\]' $confdir/../linux/linux | awk '{ print $3 }'`
 extraver="-${ver}"
 [ "$ver" = "cvs" ] && extraver=""
 
-confopt=${confopt//--host* /--host=$hdw_arch_build }
-confopt="$confopt --enable-add-ons=nptl --disable-profile --with-tls"
-confopt="$confopt --without-cvs --without-gd"
-confopt="$confopt --with-headers=$prefix/glibc-kernheaders"
+confopt="$confopt --enable-add-ons --disable-profile"
+confopt="$confopt --without-cvs --without-gd --without-selinux"
+confopt="$confopt --with-headers=$prefix/include --enable-kernel=$kernver"
 confopt="$confopt --with-binutils=$prefix/bin"
 
 unset CFLAGS

diff --git a/packages/toolchain/linux-libc-headers/linux-libc-headers b/packages/toolchain/linux-libc-headers/linux-libc-headers
index 4f95ebcc56836a21fab6bc50b470ffefa4d94881..1384f8bb52c303e33bc3a966267bc212ad4c69a1 100644 (file)
--- a/packages/toolchain/linux-libc-headers/linux-libc-headers
+++ b/packages/toolchain/linux-libc-headers/linux-libc-headers
@@ -2,9 +2,9 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 2.6.7.0
+# [V] 2.6.11.2
 # [S] 0-1
-# [D] linux-libc-headers-2.6.7.0.tar.bz2 http://ep09.pld-linux.org/~mmazur/linux-libc-headers/
+# [D] linux-libc-headers-2.6.11.2.tar.bz2 http://ep09.pld-linux.org/~mmazur/linux-libc-headers/
 
 arch=${hdw_arch//ia32/i386}
 

diff --git a/packages/toolchain/linux/linux b/packages/toolchain/linux/linux
index 27f0bcb8118a15242c67970427383fd5b5f00322..2dfcba9b9273a9cc23e4311c50ea1fd0beba07a0 100644 (file)
--- a/packages/toolchain/linux/linux
+++ b/packages/toolchain/linux/linux
@@ -2,17 +2,20 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 2.6.11.7
+# [V] 2.6.11.9
 # [S] 0-2
-# [D] linux-2.6.11.7.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/
+# [D] linux-2.6.11.9.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/
 
 build_main()   {
+        # care for crossbuild
+        if [ "$hdw_crossbuild" != "0" ] ; then
+                sed -e "s,^ARCH.*,ARCH = ${hdw_arch//ia32/i386}," \
+                -e "s,^CROSS_COMPILE.*,CROSS_COMPILE = $hdw_arch_target-," \
+                        Makefile > M.tmp
+                mv M.tmp Makefile
+        fi
        make mrproper && 
        make include/linux/version.h &&
        # change for crossbuilds
        make include/asm &&
-       mkdir -p $prefix/glibc-kernheaders
-       cp -HR include/asm $prefix/glibc-kernheaders
-       cp -R include/asm-generic $prefix/glibc-kernheaders
-       cp -R include/linux $prefix/glibc-kernheaders
                }

diff --git a/scripts/Config b/scripts/Config
index 2804a1923475bb7ef10ba01aeb1eb9ce8834a988..ba394ddb13d9f0338866d2385abfaf8dce59f035 100755 (executable)
--- a/scripts/Config
+++ b/scripts/Config
@@ -49,7 +49,7 @@ fi
 
 # lets see what root is:
 root=""
-if [ "$hdw_crossbuild" != "0" -a "$hdw_status" -lt "2" ] ; then
+if [ "$hdw_crossbuild" != "0" -o "$hdw_status" -lt "2" ] ; then
        # check for properly configured build directory
        if [ -z "$hdw_build_dir" ] ; then
                echo "please set hdw_build_dir in ./Config!"
@@ -136,6 +136,7 @@ hdw_arch_host=${hdw_arch_build}
 hdw_arch_prefix="$hdw_arch_host-"
 
 # print decissions for debugging ...
+echo "root variable set to '$root'"
 echo "hdw_arch_target variable set to $hdw_arch_target"
 echo "hdw_arch_build variable set to $hdw_arch_build"
 echo "hdw_arch_host variable ste to $hdw_arch_host"

diff --git a/scripts/Download b/scripts/Download
index 2d0126cb93cdd356a645c48d1de7973f7688140a..830ebd2bf166ab1f719b4bd5e8de1cdfdd2339e8 100755 (executable)
--- a/scripts/Download
+++ b/scripts/Download
@@ -215,12 +215,18 @@ for dir in `ls -A --ignore="CVS" ./download`; do
                        location="${mirror}/hdw-linux-${hdw_version}/$dir/$pkg/"
                echo "Downloading $dir - package $file ..."
                echo
+               # possibly the package exists
                mkdir -p ./download/$dir/$pkg ; cd ./download/$dir/$pkg
                                if [ -f ./$file ] ; then
                                        echo "$file allready downloaded."
                                        echo
+                               elif [ -n "`find ../../.. -name $file`" ] ; then
+                                       tolf="`echo $bar | awk '{ print $1 }'`"
+                                       ln -svf $tolf .
                                else
-                                       $wget_cmd -c $location$file -O pkg-src.in && \
+                               
+                                       $wget_cmd -c $location$file \
+                                               -O pkg-src.in &&
                                        mv pkg-src.in $file
                                        echo "done."
                                fi