Menu
▾
▴
[Devil-linux-commit] build/scripts ctags,NONE,1.1 inetutils,NONE,1.1 LVM2,1.5,1.6 Python,1.20,1.21 bash,1.6,1.7 bind,1.30,1.31 cyrus-imapd,1.25,1.26 dosfstools,1.9,1.10 e100,1.12,1.13 e1000,1.13,1.14 ebtables,1.8,1.9 functions,1.57,1.58 gcc,1.22,1.23 glib,1.8,1.9 glibc,1.31,1.32 iANS,1.16,1.17 iproute2,1.21,1.22 iputils,1.8,1.9 mpeg_encode,1.2,1.3 mtools,1.8,1.9 mysql,1.17,1.18 net-snmp,1.4,1.5 openh323,1.10,1.11 openh323gk,1.10,1.11 perl,1.33,1.34 postfix,1.26,1.27 prepare,1.49,1.50 pwlib,1.13,1.14 raidtools,1.15,1.16 reiserfsprogs,1.14,1.15 shadow,1.18,1.19 squid,1.19,1.20 strace,1.12,1.13 sysvinit,1.10,1.11 tcp_wrappers,1.3,1.4 util-linux,1.26,1.27 wvdial,1.11,1.12 wvstreams,1.14,1.15
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32356 Modified Files: LVM2 Python bash bind cyrus-imapd dosfstools e100 e1000 ebtables functions gcc glib glibc iANS iproute2 iputils mpeg_encode mtools mysql net-snmp openh323 openh323gk perl postfix prepare pwlib raidtools reiserfsprogs shadow squid strace sysvinit tcp_wrappers util-linux wvdial wvstreams Added Files: ctags inetutils Log Message: many program updates and fixes to get kernel 2.6.x and new build system with gcc 3.4.x and glibc 2.3.4 working --- NEW FILE: inetutils --- #!/bin/bash # $Source: /cvsroot/devil-linux/build/scripts/inetutils,v $ # $Revision: 1.1 $ # $Date: 2004/09/10 23:16:24 $ # # http://www.devil-linux.org # you need the next line, otherwise script won't be executed !!! # DL-build-system v3 ### BEGIN INIT INFO # Provides: inetutils # Required-Start: $basebuildtools $libs # Required-Stop: # Default-Start: 1 2 # Default-Stop: # Description: description ### END INIT INFO # get the directoryname of the script MYDIR=${0%/*} # source functions and config source $MYDIR/settings case $1 in build ) if [ ! -f devil-linux-patches.done ]; then touch devil-linux-patches.done bzcat $DL_DIR/src/inetutils*.patch.bz2 | patch -p1 || exit 1 fi ./configure --prefix=/usr --libexecdir=/usr/sbin \ --sysconfdir=/etc --localstatedir=/var \ --disable-logger --disable-syslogd \ --disable-whois --disable-servers || exit 1 make $PMAKE all || exit 1 strip_debug ;; install ) rm -rf $WORKDIR/tmp || exit 1 make install DESTDIR=$WORKDIR/tmp || exit 1 copy_docs $WORKDIR/tmp cp -vdpR $WORKDIR/tmp/* $CDDIR/ || exit 1 rm -rf $WORKDIR/tmp || exit 1 ;; * ) echo "ERROR ($0)" echo "please add parameter so I know what to do" exit 1 ;; esac Index: pwlib =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/pwlib,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- pwlib 21 Aug 2004 19:17:46 -0000 1.13 +++ pwlib 10 Sep 2004 23:16:24 -0000 1.14 @@ -32,15 +32,12 @@ if [ "$CONFIG_PWLIB" = "y" ]; then rm -f /usr/lib/libpt_linux_x86_r.so /usr/lib/libpt.so export PWLIBDIR=$PWD - test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes ./configure --prefix=/usr || exit 1 # parallel builds fails ($PMAKE) make bothdepend || exit 1 make $PMAKE || exit 1 strip_debug make install || exit 1 - mkdir -p $CDDIR/usr/bin - cp -p /usr/bin/asnparser /usr/bin/ptlib-config $CDDIR/usr/bin/ || exit 1 fi ;; Index: reiserfsprogs =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/reiserfsprogs,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- reiserfsprogs 16 Jan 2004 19:22:48 -0000 1.14 +++ reiserfsprogs 10 Sep 2004 23:16:24 -0000 1.15 @@ -26,7 +26,6 @@ case $1 in build ) disable_et_dyn - test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes ./configure --prefix= || exit 1 make $PMAKE all || exit 1 strip_debug Index: iputils =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/iputils,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- iputils 14 Jan 2004 03:32:26 -0000 1.8 +++ iputils 10 Sep 2004 23:16:24 -0000 1.9 @@ -23,6 +23,11 @@ # source functions and config source $MYDIR/settings +# this package needs to be replaced !!!! +if [ ! "$CONFIG_LINUX_VERSION" = "2.4" ]; then + exit 0 +fi + case $1 in build ) if [ ! -f devil-linux-patches.done ]; then Index: e100 =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/e100,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- e100 14 Jan 2004 21:31:36 -0000 1.12 +++ e100 10 Sep 2004 23:16:24 -0000 1.13 @@ -23,7 +23,7 @@ # source functions and config source $MYDIR/settings -test ! "$CONFIG_LINUX_VERSION" = "2.4" && exit 0 +test ! "$CONFIG_LINUX_VERSION" = "2.4" && exit 1 case $1 in build ) Index: squid =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/squid,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- squid 31 Aug 2004 00:58:17 -0000 1.19 +++ squid 10 Sep 2004 23:16:24 -0000 1.20 @@ -33,9 +33,6 @@ pushd helpers/basic_auth/YP/ > /dev/null bzcat $DL_DIR/src/yp_auth.patch.bz2 | patch || exit 1 popd > /dev/null - pushd helpers/ntlm_auth/SMB > /dev/null - bzcat $DL_DIR/src/squid-libntlmssp.c.patch.bz2 | patch || exit 1 - popd > /dev/null touch .patches.done fi if [ "$CONFIG_LDAP" = "y" ]; then Index: tcp_wrappers =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/tcp_wrappers,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- tcp_wrappers 11 Jan 2004 14:43:05 -0000 1.3 +++ tcp_wrappers 10 Sep 2004 23:16:25 -0000 1.4 @@ -30,6 +30,7 @@ if [ "$CONFIG_TCP_WRAPPERS" = "y" ]; then if [ ! -f .patch.done ]; then zcat $DL_DIR/src/tcp_wrappers_7.6.diff.gz | patch || exit 1 + bzcat $DL_DIR/src/tcp_wrappers-7.6-gcc34-1.patch.bz2 | patch -p1 || exit 1 touch .patch.done fi make linux || exit 1 Index: functions =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/functions,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- functions 6 Sep 2004 15:28:30 -0000 1.57 +++ functions 10 Sep 2004 23:16:24 -0000 1.58 @@ -403,6 +403,7 @@ } function disable_et_dyn () { + test "$CONFIG_LINUX_VERSION" = "2.6" && return 0 GCCSPECDIR=$(dirname $(gcc --print-libgcc-file-name)) if [ -e $GCCSPECDIR/specs.orig ]; then ln -sf specs.orig $GCCSPECDIR/specs || exit 1 @@ -410,6 +411,7 @@ } function enable_et_dyn () { + test "$CONFIG_LINUX_VERSION" = "2.6" && return 0 GCCSPECDIR=$(dirname $(gcc --print-libgcc-file-name)) if [ -e $GCCSPECDIR/specs.et_dyn ]; then ln -sf specs.et_dyn $GCCSPECDIR/specs || exit 1 @@ -417,6 +419,7 @@ } function reset_kernel_includes () { + test "$CONFIG_LINUX_VERSION" = "2.6" && return 0 rm /usr/include/{linux,asm,asm-generic} || exit 1 ln -nsf $KERNELDIR/include/linux /usr/include/linux || exit 1 ln -nsf $KERNELDIR/include/asm-i386 /usr/include/asm || exit 1 @@ -424,6 +427,7 @@ } function old_kernel_includes () { + test "$CONFIG_LINUX_VERSION" = "2.6" && return 0 OLDINCLUDEDIR=$(find_src_dir 2.4.21-include) if [ "CONFIG_KERNEL_VERSION" == "2.6" ]; then echo "**********************************************************" @@ -509,6 +513,4 @@ echo -n $'\a' sleep 1 echo -n $'\a' - sleep 1 - echo -n $'\a' } Index: raidtools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/raidtools,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- raidtools 21 Jul 2004 23:33:19 -0000 1.15 +++ raidtools 10 Sep 2004 23:16:24 -0000 1.16 @@ -25,7 +25,7 @@ MYNAME=RAIDTOOLS -test "$CONFIG_LINUX_VERSION" = "2.6" && exit 0 +test "$CONFIG_LINUX_VERSION" = "2.6" && exit 1 case $1 in build ) Index: sysvinit =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/sysvinit,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- sysvinit 11 Jan 2004 14:43:05 -0000 1.10 +++ sysvinit 10 Sep 2004 23:16:25 -0000 1.11 @@ -37,10 +37,10 @@ rm -rf $WORKDIR/tmp || exit 1 mkdir -p $WORKDIR/tmp/bin || exit 1 mkdir -p $WORKDIR/tmp/sbin || exit 1 - mkdir -p $WORKDIR/tmp/usr/bin || exit 1 + mkdir -p $WORKDIR/tmp/usr/{bin,include} || exit 1 mkdir -p $WORKDIR/tmp/usr/share/man/man{1,5,8} || exit 1 make install ROOT=$WORKDIR/tmp || exit 1 - rm -f $WORKDIR/tmp/usr/include || exit 1 + rm -rf $WORKDIR/tmp/usr/include || exit 1 rm -f $WORKDIR/tmp/usr/sbin/sulogin || exit 1 copy_docs $WORKDIR/tmp cp -dpR $WORKDIR/tmp/* $CDDIR/ || exit 1 Index: openh323gk =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/openh323gk,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- openh323gk 4 Feb 2004 20:40:59 -0000 1.10 +++ openh323gk 10 Sep 2004 23:16:24 -0000 1.11 @@ -30,19 +30,21 @@ case $1 in build ) if [ "$CONFIG_OPENH323GK" = "y" ]; then - old_kernel_includes - test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes + #old_kernel_includes + #test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes pushd .. > /dev/null export PWLIBDIR=$PWD/pwlib export OPENH323DIR=$PWD/openh323 popd > /dev/null - make $PMAKE opt || exit 1 + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || exit 1 + make $PMAKE || exit 1 strip_debug fi ;; install ) if [ "$CONFIG_OPENH323GK" = "y" ]; then + exit 1 mkdir -p $CDDIR/usr/sbin cp -dp obj_*/gnugk $CDDIR/usr/sbin || exit 1 mkdir -p $DOCDIR/openh323gk/etc Index: mtools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/mtools,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- mtools 21 Jul 2004 23:33:19 -0000 1.8 +++ mtools 10 Sep 2004 23:16:24 -0000 1.9 @@ -27,8 +27,11 @@ case $1 in build ) if [ "$CONFIG_MTOOLS" = "y" ]; then - test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes - ./configure --prefix=/usr --localstatedir=/var || exit 1 + if [ ! -f mtools-patches.done ]; then + zcat $DL_DIR/src/mtools-3.9.9-*.diff.gz | patch -p1 || exit 1 + touch mtools-patches.done + fi + ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc || exit 1 make $PMAKE all || exit 1 strip_debug fi Index: mysql =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/mysql,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- mysql 11 Jan 2004 14:43:04 -0000 1.17 +++ mysql 10 Sep 2004 23:16:24 -0000 1.18 @@ -32,6 +32,10 @@ if [ ! "$CONFIG_MYSQL_SERVER" = "y" ]; then FLAGS="--without-server" fi + if [ ! -f dl-patches.done ]; then + bzcat $DL_DIR/src/mysql-4.0.20-nptl-1.patch.bz2 | patch -p1 || exit 1 + touch dl-patches.done + fi ./configure --prefix=/usr --without-bench --without-docs --without-debug --enable-thread-safe-client --libdir=/usr/lib \ --with-openssl --with-mysqlfs --sysconfdir=/etc || exit 1 make $PMAKE all || exit 1 Index: glib =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/glib,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- glib 1 Mar 2004 02:42:37 -0000 1.8 +++ glib 10 Sep 2004 23:16:24 -0000 1.9 @@ -29,6 +29,11 @@ GLIB1=$(find_src_dir glib-1) cd $GLIB1 || exit 1 echo entered directory $(pwd) + + if [ ! -f dl-patches.done ]; then + bzcat $DL_DIR/src/glib-1.2.10-gcc34-1.patch.bz2 | patch -p1 || exit 1 + touch dl-patches.done + fi ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-libiconv || exit 1 make $PMAKE all || exit 1 Index: cyrus-imapd =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/cyrus-imapd,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- cyrus-imapd 9 Mar 2004 16:42:44 -0000 1.25 +++ cyrus-imapd 10 Sep 2004 23:16:24 -0000 1.26 @@ -34,6 +34,8 @@ fi # com_err.h must be found in /usr/include, so let's create a symlink ln -sf /usr/include/et/com_err.h /usr/include || exit 1 + export CFLAGS=-pthread + export LDFLAGS=-pthread ./configure --prefix=/usr --with-cyrus-prefix=/usr/lib/cyrus --with-cyrus-user=cyrus --with-cyrus-group=mail --enable-shared --enable-netscapehack \ --with-auth=unix --enable-listext --enable-annotatemore --enable-fulldirhash --enable-sieve || exit 1 make depend Index: shadow =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/shadow,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- shadow 6 Sep 2004 20:47:48 -0000 1.18 +++ shadow 10 Sep 2004 23:16:24 -0000 1.19 @@ -25,7 +25,11 @@ case $1 in build ) - ./configure --prefix=/usr --disable-nls --with-gnu-ld --enable-shared || exit 1 + if [ ! -f .patch.done ]; then + #bzcat $DL_DIR/src/shadow-4.0.4.1-malloc-1.patch.bz2 | patch -p1 || exit 1 + touch .patch.done + fi + ./configure --prefix=/usr --disable-nls --with-gnu-ld --enable-shared --with-selinux || exit 1 make $PMAKE || exit 1 strip_debug Index: wvstreams =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/wvstreams,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- wvstreams 11 Jan 2004 14:43:05 -0000 1.14 +++ wvstreams 10 Sep 2004 23:16:25 -0000 1.15 @@ -26,18 +26,23 @@ case $1 in build ) if [ "$CONFIG_PPP" = "y" ] && [ "$CONFIG_WVDIAL" = "y" ]; then - for PATCH in $(ls $DL_DIR/src/wvstreams*patch.bz2) - do - echo applying $PATCH - bzcat $PATCH | patch -p1 || exit 1 - done - make PREFIX=/usr LDFLAGS="-lcrypt" || exit 1 + if [ ! -f .dl-patches.done ]; then + for PATCH in $(ls $DL_DIR/src/wvstreams*patch.bz2) + do + echo applying $PATCH + bzcat $PATCH | patch -p1 || exit 1 + done + touch .dl-patches.done + fi + ./configure --prefix=/usr --with-fam --with-gdbm --with-openssl --with-zlib || exit 1 + make || exit 1 strip_debug # we have to install this immediately, because this is a library and could be needed by other sources rm -f /usr/lib/libwvstreams.so rm -f /usr/lib/libwvutils.so + rm -f /usr/lib/libuniconf.so make PREFIX=/usr install || exit 1 fi ;; Index: openh323 =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/openh323,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- openh323 21 Aug 2004 19:17:46 -0000 1.10 +++ openh323 10 Sep 2004 23:16:24 -0000 1.11 @@ -35,7 +35,6 @@ pushd .. > /dev/null export PWLIBDIR=$PWD/pwlib popd > /dev/null - test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes ./configure --prefix=/usr || exit 1 # don't use parallel builds ($PMAKE) make bothdepend || exit 1 Index: bash =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/bash,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- bash 11 Jan 2004 14:43:04 -0000 1.6 +++ bash 10 Sep 2004 23:16:24 -0000 1.7 @@ -25,7 +25,8 @@ case $1 in build ) - ./configure --prefix= --with-curses || exit 1 + ./configure --prefix=/usr --bindir=/bin \ + --without-bash-malloc --with-installed-readline || exit 1 make version.h || exit 1 make $PMAKE all || exit 1 strip_debug Index: mpeg_encode =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/mpeg_encode,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- mpeg_encode 21 Aug 2004 19:17:46 -0000 1.2 +++ mpeg_encode 10 Sep 2004 23:16:24 -0000 1.3 @@ -29,6 +29,7 @@ if [ "$CONFIG_MPEG_ENCODE" = "y" ]; then if [ ! -f .patch.done ]; then bzcat $DL_DIR/src/mpeg_encode.patch1.bz2 | patch -p0 || exit 1 + bzcat $DL_DIR/src/mpeg_encode-gcc34.patch.bz2 | patch -p1 || exit 1 touch .patch.done fi make clean Index: gcc =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/gcc,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- gcc 8 Feb 2004 15:12:16 -0000 1.22 +++ gcc 10 Sep 2004 23:16:24 -0000 1.23 @@ -27,11 +27,12 @@ case $1 in build ) + exit 0 if [ "$CONFIG_GCC_STACK_PROTECTOR" = "y" ]; then if [ ! -e ./.done_patch_protector ]; then cd gcc patch -p1 -i $WORKDIR/protector.dif || exit 1 - cp $WORKDIR/protector.c $WORKDIR/protector.h . || exit 1 + cp -rf $WORKDIR/gcc/* . || exit 1 patch -p1 -i $WORKDIR/protectonly.dif || exit 1 cd .. touch ./.done_patch_protector @@ -48,12 +49,12 @@ fi fi - if [ "$CONFIG_GCC_PIE" = "y" ]; then - if [ ! -e ./.done_patch_pie ]; then - bzcat $DL_DIR/src/gcc-3.3.2-pie-1.diff.bz2 | patch -p1 || exit 1 - touch ./.done_patch_pie - fi - fi + #if [ "$CONFIG_GCC_PIE" = "y" ]; then + # if [ ! -e ./.done_patch_pie ]; then + # bzcat $DL_DIR/src/gcc-3.3.2-pie-1.diff.bz2 | patch -p1 || exit 1 + # touch ./.done_patch_pie + # fi + #fi if [ ! -f gcc-patches.done ]; then bzcat $DL_DIR/src/gcc-3*patch.bz2 | patch -p1 || exit 1 @@ -63,33 +64,37 @@ rm -rf ../gcc-build mkdir ../gcc-build || exit 1 cd ../gcc-build || exit 1 - ../gcc-3*/configure --prefix=/usr --localstatedir=/var --enable-shared --enable-CONFIG_SHELL=/bin/bash \ - --enable-threads=posix --with-slibdir=/lib --enable-__cxa_atexit --enable-clocale=gnu \ - --enable-languages=c,c++,objc --disable-nls $CONF_HOST || exit 1 + #../gcc-3*/configure --prefix=/usr --localstatedir=/var --enable-shared --enable-CONFIG_SHELL=/bin/bash \ + # --enable-threads=posix --with-slibdir=/lib --enable-__cxa_atexit --enable-clocale=gnu \ + # --enable-languages=c,c++,objc --disable-nls $CONF_HOST || exit 1 + ../gcc-3*/configure --prefix=/usr \ + --libexecdir=/usr/lib --enable-shared --enable-threads=posix \ + --enable-__cxa_atexit --enable-clocale=gnu --enable-languages=c,c++ $CONF_HOST || exit 1 + make MAKE="make $PMAKE" $PMAKE bootstrap || exit 1 strip_debug # install it, so we use the same version everywhere - make install-no-fixedincludes || exit 1 + make install || exit 1 - if [ "$CONFIG_GCC_ET_DYN" = "y" ]; then - pushd $(find_src_dir et_dyn) > /dev/null - cd linux || exit 1 - GLIBC=$(find_src_dir glibc) - GLIBC=${GLIBC##*/} - cp $GLIBC/*.S . || exit 1 - make || exit 1 - GCCSPECDIR=$(dirname $(gcc --print-libgcc-file-name)) - cp crt1S.o $GCCSPECDIR || exit 1 - ln -sf crt1S.o $GCCSPECDIR/Scrt1.o || exit 1 - popd > /dev/null - GCCVER=${GCCSPECDIR##*/} - test ! -f $GCCSPECDIR/specs.orig && cp $GCCSPECDIR/specs $GCCSPECDIR/specs.orig - echo $GCCSPECDIR/ - bzcat $DL_DIR/src/gcc-$GCCVER-et_dyn-specs.bz2 > $GCCSPECDIR/specs.et_dyn || exit 1 - ln -sf specs.orig $GCCSPECDIR/specs || exit 1 - ln -sf specs.et_dyn $GCCSPECDIR/specs || exit 1 - fi + #if [ "$CONFIG_GCC_ET_DYN" = "y" ]; then + # pushd $(find_src_dir et_dyn) > /dev/null + # cd linux || exit 1 + # GLIBC=$(find_src_dir glibc) + # GLIBC=${GLIBC##*/} + # cp $GLIBC/*.S . || exit 1 + # make || exit 1 + # GCCSPECDIR=$(dirname $(gcc --print-libgcc-file-name)) + # cp crt1S.o $GCCSPECDIR || exit 1 + # ln -sf crt1S.o $GCCSPECDIR/Scrt1.o || exit 1 + # popd > /dev/null + # GCCVER=${GCCSPECDIR##*/} + # test ! -f $GCCSPECDIR/specs.orig && cp $GCCSPECDIR/specs $GCCSPECDIR/specs.orig + # echo $GCCSPECDIR/ + # bzcat $DL_DIR/src/gcc-$GCCVER-et_dyn-specs.bz2 > $GCCSPECDIR/specs.et_dyn || exit 1 + # ln -sf specs.orig $GCCSPECDIR/specs || exit 1 + # ln -sf specs.et_dyn $GCCSPECDIR/specs || exit 1 + #fi ;; @@ -98,7 +103,7 @@ cd ../gcc-build || exit 1 rm -rf $WORKDIR/tmp || exit 1 mkdir -p $WORKDIR/tmp/usr/bin || exit 1 - make DESTDIR=$WORKDIR/tmp install-no-fixedincludes || exit 1 + make DESTDIR=$WORKDIR/tmp install || exit 1 rm -rf $WORKDIR/tmp/usr/share || exit 1 rm -rf $WORKDIR/tmp/usr/include || exit 1 Index: util-linux =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/util-linux,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- util-linux 8 Sep 2004 01:02:36 -0000 1.26 +++ util-linux 10 Sep 2004 23:16:25 -0000 1.27 @@ -26,36 +26,31 @@ case $1 in build ) disable_et_dyn - #test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes if [ ! -f util-linux-patch.done ]; then - #if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then - echo "patch 2.4 " - bzcat $SRCDIR/util-linux-2.12b.diff.bz2 | patch -p1 || exit 1 - #fi - # echo "patch for adding kernel 2.6 support" - # bzcat $SRCDIR/util-linux-2.12-kernel-2.6.patch.bz2 | patch -p1 || exit 1 + echo "patch 2.4 " + bzcat $SRCDIR/util-linux-2.12b.diff.bz2 | patch -p1 || exit 1 touch util-linux-patch.done fi # (from LFS) GCC-3.4.1 miscompiles sfdisk if the default optimisation level is used. The following command prevents the problematic optimisation pass from being used. - #sed -i -e 's%^include ../MCONFIG%&\n\nCFLAGS:=$(CFLAGS) -fno-unit-at-a-time%' fdisk/Makefile + sed -i -e 's%^include ../MCONFIG%&\n\nCFLAGS:=$(CFLAGS) -fno-unit-at-a-time%' fdisk/Makefile ./configure || exit 1 replace_str defines.h "#define ENABLE_NLS" "" if [ "$CONFIG_GCC_ET_DYN" = "y" ]; then - make $PMAKE HAVE_SLN=yes ADD_RAW=yes DISABLE_NLS=yes LDFLAGS="-pie" || exit 1 + make $PMAKE HAVE_SLN=yes HAVE_KILL=yes ADD_RAW=yes DISABLE_NLS=yes LDFLAGS="-pie" || exit 1 else - make $PMAKE HAVE_SLN=yes ADD_RAW=yes DISABLE_NLS=yes || exit 1 + make $PMAKE HAVE_SLN=yes HAVE_KILL=yes ADD_RAW=yes DISABLE_NLS=yes || exit 1 fi # we need some of the tools later, so let's install it - make HAVE_SLN=yes ADD_RAW=yes DISABLE_NLS=yes install || + make HAVE_SLN=yes HAVE_KILL=yes ADD_RAW=yes DISABLE_NLS=yes install || strip_debug ;; install ) rm -rf $WORKDIR/tmp || exit 1 mkdir -p $WORKDIR/tmp || exit 1 - make HAVE_SLN=yes ADD_RAW=yes DISABLE_NLS=yes DESTDIR=$WORKDIR/tmp install || exit 1 + make HAVE_SLN=yes HAVE_KILL=yes ADD_RAW=yes DISABLE_NLS=yes DESTDIR=$WORKDIR/tmp install || exit 1 copy_docs $WORKDIR/tmp rm -rf $WORKDIR/tmp/usr/share || exit 1 cp -dpR $WORKDIR/tmp/etc $ETCDIR/ || exit 1 Index: net-snmp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/net-snmp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- net-snmp 11 Jan 2004 14:43:04 -0000 1.4 +++ net-snmp 10 Sep 2004 23:16:24 -0000 1.5 @@ -28,7 +28,7 @@ case $1 in build ) if [ "$CONFIG_NET_SNMP" = "y" ]; then - ./configure --prefix=/usr --disable-debugging --sysconfdir=/etc --localstatedir=/var --with-defaults --enable-shared --enable-ipv6 --enable-ucd-compatibility --with-zlib || exit 1 + ./configure --prefix=/usr --disable-debugging --sysconfdir=/etc --localstatedir=/var --with-defaults --enable-shared --enable-ipv6 --enable-ucd-compatibility --with-zlib --with-mib-modules="smux" || exit 1 # disable parallel builds make all || exit 1 strip_debug Index: prepare =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/prepare,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- prepare 2 Sep 2004 20:18:01 -0000 1.49 +++ prepare 10 Sep 2004 23:16:24 -0000 1.50 @@ -48,12 +48,12 @@ exit 1 fi - if [ -d /usr/include/asm-generic ] && [ ! -L /usr/include/asm-generic ]; then - echo "ERROR" - echo "/usr/include/asm-generic found and is a directory" - echo "please remove or rename it" - exit 1 - fi + #if [ -d /usr/include/asm-generic ] && [ ! -L /usr/include/asm-generic ]; then + # echo "ERROR" + # echo "/usr/include/asm-generic found and is a directory" + # echo "please remove or rename it" + # exit 1 + #fi if [ -d /usr/src/linux ] && [ ! -L /usr/src/linux ]; then echo "ERROR" Index: ebtables =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/ebtables,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ebtables 11 Jul 2004 14:35:20 -0000 1.8 +++ ebtables 10 Sep 2004 23:16:24 -0000 1.9 @@ -28,6 +28,10 @@ case $1 in build ) if [ "$CONFIG_EBTABLES" = "y" ]; then + if [ ! -f .patch.done ]; then + bzcat $DL_DIR/src/ebtables_iets.diff.bz2 | patch -p1 || exit 1 + touch .patch.done + fi if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then zcat $DL_DIR/src/ebtables-brnf-*.diff.gz | patch -p 1 -d $KERNELDIR || exit 1 Index: strace =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/strace,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- strace 16 Jan 2004 19:22:48 -0000 1.12 +++ strace 10 Sep 2004 23:16:25 -0000 1.13 @@ -25,7 +25,6 @@ case $1 in build ) - test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes ./configure --prefix=/usr || exit 1 make $PMAKE all || exit 1 strip_debug Index: bind =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/bind,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- bind 27 Mar 2004 17:30:19 -0000 1.30 +++ bind 10 Sep 2004 23:16:24 -0000 1.31 @@ -28,7 +28,7 @@ case $1 in build ) if [ "$CONFIG_ISC_BIND" = "y" ]; then - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-openssl=/usr/ssl --enable-libbind --enable-threads --with-libtool || exit 1 + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-openssl=/usr/ssl --enable-threads --with-libtool || exit 1 make depend || exit 1 #make $PMAKE all || exit 1 make all || exit 1 Index: glibc =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/glibc,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- glibc 10 Feb 2004 00:52:03 -0000 1.31 +++ glibc 10 Sep 2004 23:16:24 -0000 1.32 @@ -26,9 +26,11 @@ case $1 in build ) if [ "$CONFIG_GLIBC_NPTL" = "y" ]; then - tar -xjf $DL_DIR/src/nptl-*.tar.bz2 || exit 1 + #tar -xjf $DL_DIR/src/nptl-*.tar.bz2 || exit 1 + ADDON=nptl else - tar -xjf $DL_DIR/src/glibc-linuxthreads-*.tar.bz2 || exit 1 + #tar -xjf $DL_DIR/src/glibc-linuxthreads-*.tar.bz2 || exit 1 + ADDON=linuxthread fi if [ ! -f devil-linux-glibc-debian-patches.done ]; then for PATCH in $(grep -v ^# ../glibc-patches/0list) @@ -57,7 +59,8 @@ else KVER=$KERNELVERSION fi - ../glibc-2*/configure --prefix=/usr --disable-profile --enable-add-ons --libexecdir=/usr/bin --enable-kernel=$KVER --without-gd || exit 1 + ../glibc-2*/configure --prefix=/usr --disable-profile --enable-add-ons=$ADDON --libexecdir=/usr/bin \ + --enable-kernel=$KVER --without-gd -without-cvs --with-tls --with-__thread || exit 1 make $PMAKE || exit 1 #make || exit 1 Index: LVM2 =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/LVM2,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- LVM2 24 Apr 2004 01:09:57 -0000 1.5 +++ LVM2 10 Sep 2004 23:16:24 -0000 1.6 @@ -51,11 +51,19 @@ ;; install ) if [ "$CONFIG_LVM2" = "y" ]; then + rm -rf $WORKDIR/tmp || exit 1 + mkdir -p $WORKDIR/tmp || exit 1 pushd `pwd` cd ../device-mapper* - make install DESTDIR=$CDDIR || exit 1 + make install DESTDIR=$WORKDIR/tmp || exit 1 popd - make install DESTDIR=$CDDIR || exit 1 + make install DESTDIR=$WORKDIR/tmp || exit 1 + copy_docs $WORKDIR/tmp + rm -rf $WORKDIR/tmp/usr || exit 1 + cp -dvpR $WORKDIR/tmp/etc $ETCDIR/ || exit 1 + rm -rf $WORKDIR/tmp/etc || exit 1 + cp -dvpR $WORKDIR/tmp/* $CDDIR/ || exit 1 + rm -rf $WORKDIR/tmp || exit 1 fi ;; Index: Python =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/Python,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- Python 28 Feb 2004 16:15:24 -0000 1.20 +++ Python 10 Sep 2004 23:16:24 -0000 1.21 @@ -29,8 +29,6 @@ build ) if [ "$CONFIG_PYTHON" = "y" ]; then disable_et_dyn - old_kernel_includes - test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes rm -rf $WORKDIR/Python-install mkdir -p $WORKDIR/Python-install/usr ./configure --prefix=$WORKDIR/Python-install/usr --host=$CONF_HOST --with-threads \ Index: perl =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/perl,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- perl 6 Sep 2004 20:31:33 -0000 1.33 +++ perl 10 Sep 2004 23:16:24 -0000 1.34 @@ -30,11 +30,10 @@ if [ "$CONFIG_PERL" = "y" ]; then echo >> ./hints/linux.sh echo "archname='i$CONFIG_CPU-linux'" >> ./hints/linux.sh - - ./Configure -Dprefix=/usr -Dinstallprefix=$WORKDIR/tmp -Dusedl -d -e || exit 1 + + ./Configure -Dprefix=/usr -Dinstallprefix=$WORKDIR/tmp -Dusethreads -d -e || exit 1 # parallel build fails - do not user $PMAKE make || exit 1 - #make test || exit 1 #strip_debug Index: postfix =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/postfix,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- postfix 2 Sep 2004 13:20:36 -0000 1.26 +++ postfix 10 Sep 2004 23:16:24 -0000 1.27 @@ -30,15 +30,15 @@ if [ "$CONFIG_POSTFIX" = "y" ]; then make tidy CCARGS="" - AUXLIBS="" + AUXLIBS="-lpthread" if [ "$CONFIG_POSTFIX_TLS" = "y" ]; then if [ ! -f postfix_tls_patch ]; then PFIXTLSPATCH=$(ls $WORKDIR/pfixtls*/pfixtls.diff) patch -p1 < $PFIXTLSPATCH || exit 1 touch postfix_tls_patch fi - CCARGS="-DHAS_SSL -I/usr/include/openssl" - AUXLIBS="-lssl -lcrypto" + CCARGS="$CCARGS -DHAS_SSL -I/usr/include/openssl" + AUXLIBS="$AUXLIBS -lssl -lcrypto" fi if [ "$CONFIG_CYRUS_SASL" = "y" ]; then CCARGS="$CCARGS -DUSE_SASL_AUTH -I/usr/include/sasl" Index: iANS =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/iANS,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- iANS 14 Jan 2004 21:31:36 -0000 1.16 +++ iANS 10 Sep 2004 23:16:24 -0000 1.17 @@ -25,7 +25,7 @@ MYNAME=IANS -test ! "$CONFIG_LINUX_VERSION" = "2.4" && exit 0 +test ! "$CONFIG_LINUX_VERSION" = "2.4" && exit 1 case $1 in build ) Index: iproute2 =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/iproute2,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- iproute2 14 Jan 2004 03:32:26 -0000 1.21 +++ iproute2 10 Sep 2004 23:16:24 -0000 1.22 @@ -31,11 +31,12 @@ if [ ! -f devil-linux-patches.done ]; then touch devil-linux-patches.done zcat $DL_DIR/src/iproute_*.diff.gz | patch -p1 || exit 1 + bzcat $DL_DIR/src/iproute2-*.patch.bz2 | patch -p1 || exit 1 fi replace_str Makefile /usr/src/linux $KERNELDIR replace_str Config "TC_CONFIG_ATM=y" "TC_CONFIG_ATM=n" - old_kernel_includes + #old_kernel_includes make $PMAKE all || exit 1 strip_debug fi --- NEW FILE: ctags --- #!/bin/bash # $Source: /cvsroot/devil-linux/build/scripts/ctags,v $ # $Revision: 1.1 $ # $Date: 2004/09/10 23:16:24 $ # # http://www.devil-linux.org # you need the next line, otherwise script won't be executed !!! # DL-build-system v3 ### BEGIN INIT INFO # Provides: ctags # Required-Start: $basebuildtools glibc # Required-Stop: # Default-Start: 1 # Default-Stop: # Description: description ### END INIT INFO # get the directoryname of the script MYDIR=${0%/*} # source functions and config source $MYDIR/settings case $1 in build ) ./configure --prefix=/usr || exit 1 make $PMAKE || exit 1 make install || exit 1 strip_debug ;; * ) echo "ERROR ($0)" echo "please add parameter so I know what to do" exit 1 ;; esac Index: wvdial =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/wvdial,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- wvdial 11 Jan 2004 14:43:05 -0000 1.11 +++ wvdial 10 Sep 2004 23:16:25 -0000 1.12 @@ -37,7 +37,7 @@ install ) if [ "$CONFIG_PPP" = "y" ] && [ "$CONFIG_WVDIAL" = "y" ]; then mkdir -p $CDDIR/usr/bin - cp -dpR src/pppmon src/wvdial src/wvdialconf $CDDIR/usr/bin || exit 1 + cp -dpR pppmon wvdial wvdialconf $CDDIR/usr/bin || exit 1 copy_man mkdir -p $ETCDIR/etc/ppp/peers || exit 1 touch $ETCDIR/etc/wvdial.conf || exit 1 Index: dosfstools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/dosfstools,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- dosfstools 8 Feb 2004 14:54:28 -0000 1.9 +++ dosfstools 10 Sep 2004 23:16:24 -0000 1.10 @@ -32,10 +32,10 @@ if [ "$CONFIG_DOSFSTOOLS" = "y" ]; then if [ ! -f dosfsutils-patches.done ]; then bzcat $DL_DIR/src/dosfstools-2.10-llseek.patch.bz2 | patch -p1 || exit 1 + test "$CONFIG_LINUX_VERSION" = "2.6" && bzcat $DL_DIR/src/dosfstools-2.10-kernel-2.6-1.patch.bz2 | patch -p1 || exit 1 touch dosfsutils-patches.done fi - test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes make $PMAKE || exit 1 strip_debug fi Index: e1000 =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/e1000,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- e1000 16 Jan 2004 01:47:55 -0000 1.13 +++ e1000 10 Sep 2004 23:16:24 -0000 1.14 @@ -23,7 +23,7 @@ # source functions and config source $MYDIR/settings -test ! "$CONFIG_LINUX_VERSION" = "2.4" && exit 0 +test ! "$CONFIG_LINUX_VERSION" = "2.4" && exit 1 case $1 in build ) |
