Menu
▾
▴
[Devil-linux-commit] build/scripts Python,1.21,1.22 build.sh,1.91,1.92 cipe,1.18,1.19 freeramdisk,1.8,1.9 functions,1.60,1.61 iproute2,1.23,1.24 openh323gk,1.12,1.13 reiserfsprogs,1.16,1.17 rpm,1.12,1.13 watchdog,1.18,1.19 longhaul,1.3,NONE mxser,1.2,NONE pptp-patches,1.15,NONE raidtools,1.18,NONE
|
From: Heiko Z. <smi...@us...> - 2004-12-29 03:14:41
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5113/scripts Modified Files: Python build.sh cipe freeramdisk functions iproute2 openh323gk reiserfsprogs rpm watchdog Removed Files: longhaul mxser pptp-patches raidtools Log Message: let's do some cleanup --- longhaul DELETED --- Index: functions =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/functions,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- functions 12 Dec 2004 05:24:25 -0000 1.60 +++ functions 29 Dec 2004 03:14:27 -0000 1.61 @@ -402,46 +402,6 @@ fi } -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 - fi -} - -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 - fi -} - -function reset_kernel_includes () { - test "$CONFIG_LINUX_VERSION" = "2.6" && return 0 - rm /usr/include/{linux,asm,asm-generic} - ln -nsf $KERNELDIR/include/linux /usr/include/linux || exit 1 - ln -nsf $KERNELDIR/include/asm-i386 /usr/include/asm || exit 1 - ln -nsf $KERNELDIR/include/asm-generic /usr/include/asm-generic || exit 1 -} - -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 "**********************************************************" - echo "HEY DUDE, PLEASE NOTE ..... YOU COMPILE FOR KERNEL 2.6" - echo "AND USE OLD INCLUDES FROM 2.4 BECAUSE THE PACKAGE ISNT" - echo "COMPILE-READY FOR 2.6" - echo "**********************************************************" - sleep 2 - fi - ln -nsf $OLDINCLUDEDIR/linux /usr/include/linux || exit 1 - ln -nsf $OLDINCLUDEDIR/asm-i386 /usr/include/asm || exit 1 - ln -nsf $OLDINCLUDEDIR/asm-generic /usr/include/asm-generic || exit 1 -} - function add_kernel_options() { marker="# file added $1" c=`grep -c "$marker" $KERNELDIR/.config` Index: build.sh =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v retrieving revision 1.91 retrieving revision 1.92 diff -u -d -r1.91 -r1.92 --- build.sh 28 Dec 2004 18:55:08 -0000 1.91 +++ build.sh 29 Dec 2004 03:14:27 -0000 1.92 @@ -425,12 +425,6 @@ echo -n " (in $SOURCEDIR)" fi - # (re-)enable the compilation as ET_DYN in case a script disabled it - enable_et_dyn - - # reset to the new kernel includes - reset_kernel_includes - echo t1=$(date +"%s") Index: cipe =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/cipe,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- cipe 11 Jan 2004 14:43:04 -0000 1.18 +++ cipe 29 Dec 2004 03:14:27 -0000 1.19 @@ -32,8 +32,6 @@ if [ "$CONFIG_CIPE" = "y" ]; then unset MAKELEVEL - disable_et_dyn - ./configure --prefix=/usr --sysconfdir=/etc/cipe --disable-debug --disable-pkcipe || exit 1 # # "--disable-pkcipe" because of this statement in the pkcipe README file: Index: Python =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/Python,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- Python 10 Sep 2004 23:16:24 -0000 1.21 +++ Python 29 Dec 2004 03:14:12 -0000 1.22 @@ -28,7 +28,6 @@ case $1 in build ) if [ "$CONFIG_PYTHON" = "y" ]; then - disable_et_dyn rm -rf $WORKDIR/Python-install mkdir -p $WORKDIR/Python-install/usr ./configure --prefix=$WORKDIR/Python-install/usr --host=$CONF_HOST --with-threads \ --- raidtools DELETED --- --- pptp-patches DELETED --- Index: openh323gk =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/openh323gk,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- openh323gk 12 Nov 2004 01:23:57 -0000 1.12 +++ openh323gk 29 Dec 2004 03:14:27 -0000 1.13 @@ -31,8 +31,6 @@ build ) if [ "$CONFIG_OPENH323GK" = "y" ]; then cd $(find_src_dir gnugk) - #old_kernel_includes - #test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes pushd .. > /dev/null export PWLIBDIR=$PWD/pwlib export OPENH323DIR=$PWD/openh323 Index: iproute2 =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/iproute2,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- iproute2 10 Oct 2004 19:32:55 -0000 1.23 +++ iproute2 29 Dec 2004 03:14:27 -0000 1.24 @@ -36,7 +36,6 @@ replace_str Makefile /usr/src/linux $KERNELDIR replace_str Config "TC_CONFIG_ATM=y" "TC_CONFIG_ATM=n" - #old_kernel_includes make $PMAKE all || exit 1 strip_debug fi Index: watchdog =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/watchdog,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- watchdog 28 Dec 2004 18:55:09 -0000 1.18 +++ watchdog 29 Dec 2004 03:14:27 -0000 1.19 @@ -27,7 +27,6 @@ case $1 in build ) if [ "$CONFIG_WATCHDOG" = "y" ]; then - disable_et_dyn if [ ! -f watchdog_patch_done ]; then bzcat $DL_DIR/src/watchdog-errno.patch.bz2 | patch -p1 || exit 1 touch watchdog_patch_done @@ -41,7 +40,6 @@ install ) if [ "$CONFIG_WATCHDOG" = "y" ]; then - disable_et_dyn rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR/usr/sbin || exit 1 mkdir -p $TMPDIR/etc || exit 1 Index: freeramdisk =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/freeramdisk,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- freeramdisk 7 Jun 2004 03:11:35 -0000 1.8 +++ freeramdisk 29 Dec 2004 03:14:27 -0000 1.9 @@ -25,7 +25,6 @@ case $1 in build ) - test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes make $PMAKE freeramdisk || exit 1 strip_debug ;; Index: reiserfsprogs =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/reiserfsprogs,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- reiserfsprogs 12 Dec 2004 21:48:09 -0000 1.16 +++ reiserfsprogs 29 Dec 2004 03:14:27 -0000 1.17 @@ -25,14 +25,12 @@ case $1 in build ) - disable_et_dyn ./configure --prefix= || exit 1 make $PMAKE all || exit 1 strip_debug ;; install ) - disable_et_dyn rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR || exit 1 make install DESTDIR=$TMPDIR || exit 1 Index: rpm =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/rpm,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- rpm 12 Dec 2004 21:48:09 -0000 1.12 +++ rpm 29 Dec 2004 03:14:27 -0000 1.13 @@ -28,7 +28,6 @@ case $1 in build ) if [ "$CONFIG_RPM" = "y" ]; then - disable_et_dyn ./configure --prefix=/usr --disable-nls --without-python --without-apidocs --without-dmalloc || exit 1 make $PMAKE all || exit 1 strip_debug --- mxser DELETED --- |
