Menu
▾
▴
[Devil-linux-commit] build/scripts dbus, NONE, 1.1 sysfsutils, NONE, 1.1 bluez-libs, 1.1, 1.2 build.sh, 1.98, 1.99 compartment, 1.15, 1.16 functions, 1.63, 1.64 gcc, 1.35, 1.36 glibc, 1.49, 1.50 gpm, 1.6, 1.7 httpd, 1.8, 1.9 inetutils, 1.4, 1.5 insserv, 1.13, 1.14 linux, 1.58, 1.59 lm_sensors, 1.22, 1.23 mtools, 1.10, 1.11 openh323gk, 1.17, 1.18 p7zip, 1.5, 1.6 prepare, 1.61, 1.62 settings, 1.50, 1.51 udev, 1.7, 1.8 watchdog, 1.19, 1.20
|
From: Heiko Z. <smi...@us...> - 2007-03-20 02:41:53
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv29359/scripts Modified Files: bluez-libs build.sh compartment functions gcc glibc gpm httpd inetutils insserv linux lm_sensors mtools openh323gk p7zip prepare settings udev watchdog Added Files: dbus sysfsutils Log Message: lot's of updates to get the new 1.3 environment working Index: linux =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/linux,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- linux 4 Oct 2005 02:49:43 -0000 1.58 +++ linux 20 Mar 2007 02:41:45 -0000 1.59 @@ -38,8 +38,10 @@ make CC="gcc -no-pie -fno-stack-protector-all" $PMAKE modules || exit 1 else make oldconfig - make CC="gcc -no-pie" $PMAKE bzImage || exit 1 - make CC="gcc -no-pie" $PMAKE modules || exit 1 + #make CC="gcc -no-pie" $PMAKE bzImage || exit 1 + #make CC="gcc -no-pie" $PMAKE modules || exit 1 + make $PMAKE bzImage || exit 1 + make $PMAKE modules || exit 1 fi ;; Index: inetutils =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/inetutils,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- inetutils 30 Oct 2006 16:20:54 -0000 1.4 +++ inetutils 20 Mar 2007 02:41:45 -0000 1.5 @@ -27,7 +27,7 @@ build ) if [ ! -f devil-linux-patches.done ]; then touch devil-linux-patches.done - bzcat $DL_DIR/src/inetutils*.patch.bz2 | patch -p1 || exit 1 + #bzcat $DL_DIR/src/inetutils*.patch.bz2 | patch -p1 || exit 1 fi ./configure --prefix=/usr --libexecdir=/usr/sbin \ Index: gcc =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/gcc,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- gcc 30 Sep 2005 02:17:26 -0000 1.35 +++ gcc 20 Mar 2007 02:41:45 -0000 1.36 @@ -42,20 +42,23 @@ fi if [ ! -f gcc-patches.done ]; then - echo "applying gcc patches" - bzcat $DL_DIR/src/gcc-3*patch.bz2 | patch -p1 || exit 1 + #echo "applying gcc patches" + #bzcat $DL_DIR/src/gcc-4*patch.bz2 | patch -p1 || exit 1 touch gcc-patches.done fi sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in - replace_str gcc/Makefile.in "CFLAGS = -g" "CFLAGS = -g -D_LIBC_PROVIDES_SSP_" - replace_str gcc/Makefile.in "BOOT_CFLAGS = -g -O2" "CFLAGS=-g -O2 -D_LIBC_PROVIDES_SSP_" + #replace_str gcc/Makefile.in "CFLAGS = -g" "CFLAGS = -g -D_LIBC_PROVIDES_SSP_" + #replace_str gcc/Makefile.in "BOOT_CFLAGS = -g -O2" "CFLAGS=-g -O2 -D_LIBC_PROVIDES_SSP_" + sed -i 's/^XCFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in + sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in + sed -i 's/@have_mktemp_command@/yes/' gcc/gccbug.in rm -rf ../gcc-build - mkdir ../gcc-build || exit 1 + mkdir ../gcc-build || exit 1 cd ../gcc-build || exit 1 - ../gcc-3*/configure --prefix=/usr --localstatedir=/var --enable-shared --enable-CONFIG_SHELL=/bin/bash \ + ../gcc-4*/configure --prefix=/usr --localstatedir=/var --enable-shared --enable-CONFIG_SHELL=/bin/bash \ --enable-threads=posix --libexecdir=/usr/lib --enable-__cxa_atexit --enable-clocale=gnu \ --enable-languages=c,c++,objc --disable-nls --with-gnu-ld $CONFIG_EXTRA $CONF_HOST || exit 1 make MAKE="make $PMAKE" $PMAKE bootstrap || exit 1 Index: compartment =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/compartment,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- compartment 30 Jan 2004 14:57:07 -0000 1.15 +++ compartment 20 Mar 2007 02:41:45 -0000 1.16 @@ -31,6 +31,7 @@ bzcat $DL_DIR/src/compartment-env.diff.bz2 | patch -p1 || exit 1 bzcat $DL_DIR/src/compartment-no-close-fd.diff.bz2 | patch -p1 || exit 1 bzcat $DL_DIR/src/compartment-gcc33.diff.bz2 | patch -p1 || exit 1 + bzcat $DL_DIR/src/compartment-gcc4.diff.bz2 | patch -p1 || exit 1 touch compartment_patch_done fi --- NEW FILE: dbus --- #!/bin/bash # $Source: /cvsroot/devil-linux/build/scripts/dbus,v $ # $Revision: 1.1 $ # $Date: 2007/03/20 02:41:45 $ # http://www.devil-linux.org # ARPWATCH added by Gunther Stammwitz <gs...@ma...> # you need the next line, otherwise script won't be executed !!! # DL-build-system v3 ### BEGIN INIT INFO # Provides: dbus # 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 MYNAME=ARPWATCH case $1 in build ) if [ "$CONFIG_DBUS" = "y" ]; then ./configure --prefix=/usr --sysconfdir=/etc || exit 1 make $PMAKE all || exit 1 strip_debug #let's install it, other programs need this package make install || exit 1 fi ;; install ) if [ "$CONFIG_DBUS" = "y" ]; then rm -rf $TMPDIR || exit 1 #mkdir -p $TMPDIR/usr/sbin || exit 1 #mkdir -p $TMPDIR/usr/share/man/man8 || exit 1 #mkdir -p $ETCDIR/etc/arpwatch || exit 1 make install DESTDIR=$TMPDIR || exit 1 exit 1 make install-man DESTDIR=$TMPDIR || exit 1 copy_files $TMPDIR/usr $CDDIR/ || exit 1 rm -rf $TMPDIR || exit 1 cp $MYDIR/scripts/arpwatch $ETCDIR/etc/init.d || exit 1 echo "# Start arpwatch?" >> $CONFIGFILE echo "START_ARPWATCH=no" >> $CONFIGFILE echo >> $CONFIGFILE echo "HELP_$MYNAME=\"$MYNAME is a daemon which discover and monitor MAC changes on a local network\"" >> $SOFTWAREHELP fi ;; * ) echo "ERROR ($0)" echo "please add parameter so I know what to do" exit 1 ;; esac Index: prepare =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/prepare,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- prepare 18 Aug 2006 15:38:14 -0000 1.61 +++ prepare 20 Mar 2007 02:41:45 -0000 1.62 @@ -30,31 +30,9 @@ exit 1 fi - case $1 in prepare ) - #if [ -d /usr/include/linux ] && [ ! -L /usr/include/linux ]; then - # echo "ERROR" - # echo "/usr/include/linux found and is a directory" - # echo "please remove or rename it" - # exit 1 - #fi - - #if [ -d /usr/include/asm ] && [ ! -L /usr/include/asm ]; then - # echo "ERROR" - # echo "/usr/include/asm 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" echo "/usr/src/linux found and is a directory" @@ -62,27 +40,15 @@ exit 1 fi - #if [ -e /usr/include/linux ]; then - # rm /usr/include/linux - #fi - # let's find out if we force the usage of old kernel include files # this is sometimes necessary, when they change too much in the new kernel KERN_INC=$(find_src_dir kernel-includes) - #if [ -z "$KERN_INC" ]; then - # ln -sf $KERNELDIR/include/linux /usr/include/linux || exit 1 - # ln -sf $KERNELDIR/include/asm-i386 /usr/include/asm || exit 1 - # ln -sf $KERNELDIR/include/asm-generic /usr/include/asm-generic || exit 1 - #else - # ln -sf $KERN_INC/linux /usr/include/linux || exit 1 - # ln -sf $KERN_INC/asm /usr/include/asm || exit 1 - # ln -sf $KERN_INC/asm-generic /usr/include/asm-generic || exit 1 - #fi - ln -sf $KERNELDIR /usr/src/linux || exit 1 - make -C $KERNELDIR include/linux/version.h || exit 1 + #make -C $KERNELDIR mrproper || exit 1 + make -C $KERNELDIR headers_check || exit 1 + #make -C $KERNELDIR INSTALL_HDR_PATH=/usr headers_install || exit 1 ;; @@ -171,12 +137,6 @@ make oldconfig || exit 1 - if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then - make dep || exit 1 - else - make prepare0 || exit 1 - fi - popd > /dev/null # make sure we have all needed and clean directories Index: settings =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/settings,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- settings 22 Feb 2007 13:43:16 -0000 1.50 +++ settings 20 Mar 2007 02:41:45 -0000 1.51 @@ -49,10 +49,7 @@ CONF_HOST="i$CONFIG_CPU-pc-linux-gnu" KERNELDIR=$(find_src_dir linux-$CONFIG_LINUX_VERSION) -KERNELVERSION=$(grep UTS_RELEASE $KERNELDIR/include/linux/version.h 2> /dev/null | sed 's/\"//g' | cut -d " " -f 3) -if [ "$KERNELVERSION" == "" ] ; then -KERNELVERSION=$(grep UTS_RELEASE $KERNELDIR/include/linux/utsrelease.h 2> /dev/null | sed 's/\"//g' | cut -d " " -f 3) -fi +KERNELVERSION=$(make -s -C $KERNELDIR kernelversion 2> /dev/null) SRCDIR=$DL_DIR/src SRCEXTRADIR=$DL_DIR/src-extra Index: glibc =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/glibc,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- glibc 29 Jun 2005 14:42:40 -0000 1.49 +++ glibc 20 Mar 2007 02:41:45 -0000 1.50 @@ -27,8 +27,9 @@ build ) #cd $DL_DIR/tmp/glibc-2* || exit 1 touch /etc/ld.so.conf - ADDON=nptl tar -xjf $DL_DIR/src/glibc-libidn-*tar.bz2 || exit 1 + mv glibc-libidn-* libidn || exit 1 + if [ ! -f devil-linux-glibc-debian-patches.done ]; then for PATCH in $(grep -v ^# ../glibc-patches/0list) do @@ -63,15 +64,13 @@ rm -rf ../glibc-build mkdir ../glibc-build || exit 1 cd ../glibc-build || exit 1 - - #echo "libc_cv_forced_unwind=yes" > config.cache - #echo "libc_cv_c_cleanup=yes" >> config.cache - #export LD_ASSUME_KERNEL=2.2.5 - #../glibc-2*/configure --prefix=/usr --disable-profile --enable-add-ons=$ADDON --libexecdir=/usr/bin \ - # -without-cvs --with-tls --with-__thread --enable-bind-now --cache-file=config.cache || exit 1 - ../glibc-2*/configure --prefix=/usr --disable-profile --enable-add-ons=$ADDON --libexecdir=/usr/bin \ - -without-cvs --enable-bind-now || exit 1 + sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED + + #../glibc-2*/configure --prefix=/usr --disable-profile --enable-add-ons --libexecdir=/usr/bin \ + # -without-cvs --enable-bind-now || exit 1 + ../glibc-2*/configure --prefix=/usr --disable-profile --enable-add-ons --libexecdir=/usr/lib/glibc \ + --enable-kernel=2.6.0 || exit 1 make $PMAKE || exit 1 strip_debug || exit 1 --- NEW FILE: sysfsutils --- #!/bin/bash # $Source: /cvsroot/devil-linux/build/scripts/sysfsutils,v $ # $Revision: 1.1 $ # $Date: 2007/03/20 02:41:45 $ # http://www.devil-linux.org # you need the next line, otherwise script won't be executed !!! # DL-build-system v3 ### BEGIN INIT INFO # Provides: sysfsutils # 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 MYNAME=FILE case $1 in build ) ./configure --prefix=/usr --localstatedir=/var || exit 1 make all || exit 1 strip_debug make install || exit 1 ;; install ) if [ "$CONFIG_FILE" = "y" ]; then rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR/usr/bin || exit 1 make install DESTDIR=$TMPDIR || exit 1 echo "we need to finalize this script first" exit 1 copy_docs $TMPDIR rm -rf $TMPDIR/usr/include || exit 1 rm -rf $TMPDIR/usr/lib/*a || exit 1 copy_files $TMPDIR/usr $CDDIR/ || exit 1 rm -rf $TMPDIR || exit 1 fi ;; * ) echo "ERROR ($0)" echo "please add parameter so I know what to do" exit 1 ;; esac Index: udev =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/udev,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- udev 24 Jan 2005 00:35:20 -0000 1.7 +++ udev 20 Mar 2007 02:41:45 -0000 1.8 @@ -29,7 +29,9 @@ ln -sf $KERNELDIR/include/linux klibc || exit 1 # lets first build the static version we need for the initrd make clean || exit 1 - make $PMAKE all USE_LOG=false udevdir=/dev LDFLAGS=--static || exit 1 + make $PMAKE all udevdir=/dev LDFLAGS=--static EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id \ + extras/firmware extras/floppy extras/path_id extras/rule_generator \ + extras/scsi_id extras/usb_id extras/volume_id"|| exit 1 strip_debug TMPDIR=$(pwd)/DL-static rm -rf $TMPDIR || exit 1 @@ -38,16 +40,24 @@ # now create the dynamic version for the final OS make clean || exit 1 - make $PMAKE all USE_LOG=false udevdir=/dev || exit 1 + #make $PMAKE all USE_LOG=false udevdir=/dev || exit 1 + make $PMAKE all EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id \ + extras/firmware extras/floppy extras/path_id extras/rule_generator \ + extras/scsi_id extras/usb_id extras/volume_id" || exit 1 strip_debug TMPDIR=$(pwd)/DL-dynamic rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR || exit 1 - make install DESTDIR=$TMPDIR udevdir=/dev || exit 1 + make install DESTDIR=$TMPDIR udevdir=/dev EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id \ + extras/firmware extras/floppy extras/path_id extras/rule_generator \ + extras/scsi_id extras/usb_id extras/volume_id"|| exit 1 ;; install ) + exit 1 + #sync up with lfs book + for DIR in DL-dynamic #DL-static do mkdir -p $DIR/etc/udev/scripts || exit 1 Index: bluez-libs =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/bluez-libs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- bluez-libs 31 Dec 2004 03:09:37 -0000 1.1 +++ bluez-libs 20 Mar 2007 02:41:45 -0000 1.2 @@ -10,7 +10,7 @@ ### BEGIN INIT INFO # Provides: bluez-libs -# Required-Start: $basebuildtools $libs +# Required-Start: $basebuildtools $libs dbus # Required-Stop: # Default-Start: 1 2 # Default-Stop: Index: openh323gk =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/openh323gk,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- openh323gk 27 Dec 2005 15:46:15 -0000 1.17 +++ openh323gk 20 Mar 2007 02:41:45 -0000 1.18 @@ -30,6 +30,7 @@ case $1 in build ) if [ "$CONFIG_OPENH323GK" = "y" ]; then + cd $(find_src_dir gnugk) export PWLIBDIR=$(find_src_dir pwlib) export OPENH323DIR=$(find_src_dir openh323) ./configure --prefix=/usr || exit 1 @@ -40,6 +41,7 @@ install ) if [ "$CONFIG_OPENH323GK" = "y" ]; then + cd $(find_src_dir gnugk) mkdir -p $CDDIR/usr/sbin cp -dp obj_*/gnugk $CDDIR/usr/sbin || exit 1 mkdir -p $DOCDIR/openh323gk/etc Index: build.sh =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v retrieving revision 1.98 retrieving revision 1.99 diff -u -d -r1.98 -r1.99 --- build.sh 25 May 2006 18:29:30 -0000 1.98 +++ build.sh 20 Mar 2007 02:41:45 -0000 1.99 @@ -56,6 +56,7 @@ echo "Someone messed up this script :(" exit 1 fi + # fake uname to display another platform we want to compile the kernel for # also make sure our kernel version is displayed Index: mtools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/mtools,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- mtools 12 Dec 2004 21:48:08 -0000 1.10 +++ mtools 20 Mar 2007 02:41:45 -0000 1.11 @@ -28,7 +28,7 @@ build ) if [ "$CONFIG_MTOOLS" = "y" ]; then if [ ! -f mtools-patches.done ]; then - zcat $DL_DIR/src/mtools-3.9.9-*.diff.gz | patch -p1 || exit 1 + zcat $DL_DIR/src/mtools-3.9.10-*.diff.gz | patch -p1 || exit 1 touch mtools-patches.done fi ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc || exit 1 Index: watchdog =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/watchdog,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- watchdog 29 Dec 2004 03:14:27 -0000 1.19 +++ watchdog 20 Mar 2007 02:41:45 -0000 1.20 @@ -28,7 +28,7 @@ build ) if [ "$CONFIG_WATCHDOG" = "y" ]; then if [ ! -f watchdog_patch_done ]; then - bzcat $DL_DIR/src/watchdog-errno.patch.bz2 | patch -p1 || exit 1 + #bzcat $DL_DIR/src/watchdog-errno.patch.bz2 | patch -p1 || exit 1 touch watchdog_patch_done fi add_kernel_options $MYDIR/config/config_watchdog Index: p7zip =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/p7zip,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- p7zip 7 Feb 2007 16:28:55 -0000 1.5 +++ p7zip 20 Mar 2007 02:41:45 -0000 1.6 @@ -26,7 +26,10 @@ case $1 in build ) if [ "$CONFIG_CLAMAV_PATCH" = "y" ]; then - bzcat $SRCDIR/p7zip_*-libun7zip.patch.bz2 | patch -p1 || exit 1 + if [ ! -f .dl_patches_done ]; then + bzcat $SRCDIR/p7zip_*-libun7zip.patch.bz2 | patch -p1 || exit 1 + touch .dl_patches_done + fi pushd 7zip/Bundles/Un7Zip > /dev/null || exit 1 make $PMAKE || exit 1 # We should install libs immediately Index: gpm =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/gpm,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- gpm 25 Jul 2005 18:10:19 -0000 1.6 +++ gpm 20 Mar 2007 02:41:45 -0000 1.7 @@ -32,7 +32,7 @@ sed -i s/.'"$(MAKEINFO)" != "no"'/' "$(MAKEINFO)" != "no --no-split"'/ doc/Makefile.in ./configure --prefix=/usr --sysconfdir=/etc || exit 1 # parallel build doesn't work - make all || exit 1 + LDFLAGS="-lm" make all || exit 1 strip_debug fi ;; Index: lm_sensors =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/lm_sensors,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- lm_sensors 12 Dec 2004 21:48:08 -0000 1.22 +++ lm_sensors 20 Mar 2007 02:41:45 -0000 1.23 @@ -10,7 +10,7 @@ ### BEGIN INIT INFO # Provides: lm_sensors -# Required-Start: $basebuildtools $libs i2c rrdtool +# Required-Start: $basebuildtools $libs i2c rrdtool sysfsutils # Required-Stop: # Default-Start: 1 2 # Default-Stop: Index: insserv =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/insserv,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- insserv 22 Mar 2004 00:25:25 -0000 1.13 +++ insserv 20 Mar 2007 02:41:45 -0000 1.14 @@ -27,8 +27,8 @@ build ) if [ ! -f .patch.done ]; then bzcat $DL_DIR/src/insserv-core.diff.bz2 | patch -p1 || exit 1 - bzcat $DL_DIR/src/insserv-boot.diff.bz2 | patch -p1 || exit 1 - bzcat $DL_DIR/src/insserv-local.diff.bz2 | patch -p1 || exit 1 + #bzcat $DL_DIR/src/insserv-boot.diff.bz2 | patch -p1 || exit 1 + #bzcat $DL_DIR/src/insserv-local.diff.bz2 | patch -p1 || exit 1 touch .patch.done fi make clean Index: functions =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/functions,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- functions 7 Oct 2005 14:12:40 -0000 1.63 +++ functions 20 Mar 2007 02:41:45 -0000 1.64 @@ -430,10 +430,11 @@ function set_all_kernel_options () { if [ -d $KERNELDIR/$1 ]; then if [ "$CONFIG_LINUX_VERSION" = "2.6" ]; then + echo "executing set_all_kernel_options in $1" for FILE in $( find $KERNELDIR/$1 -name Kconfig ); do # anybody who know awk could probably shorten the next line quite a bit.... # don't remove the 'sort' command, we use it to add a necessary newline before 'column' - for CFG in $( grep -s -v "^#" $FILE | grep ^config -A 1 | sed -e s/config/""/g | tr -d "\n" | sed -e s/--/"\n"/g | sort | column -t 2> /dev/null | fmt -u -s -w 9999 | cut -f -2 -d " " | sed -e s/" "/#/g ); do + for CFG in $( grep -s -v "^#" $FILE | grep ^config -A 1 | sed -e s/config/""/g | tr -d "\n" | sed -e s/--/"\n"/g | sort | column -t 2> /dev/null | fmt -u -s -w 999 | cut -f -2 -d " " | sed -e s/" "/#/g ); do CFGOPTION="CONFIG_"${CFG%%#*} if [ -n "$(echo $CFGOPTION | grep DEBUG 2> /dev/null)" ]; then set_kernel_option $CFGOPTION n @@ -453,19 +454,6 @@ done fi - if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then - for FILE in $( find $KERNELDIR/$1 -name Config.in ); do - for CFG in $( grep -s tristate $FILE | cut -d "'" -f 3 | cut -d " " -f 2 ); do - set_kernel_option $CFG m - done - for CFG in $( grep -s bool $FILE | cut -d "'" -f 3 | cut -d " " -f 2 ); do - set_kernel_option $CFG y - done - for CFG in $( grep -s "^ *int " $FILE | cut -d "'" -f 3 | cut -d " " -f 2,3 | sed 's/ /#/' ); do - set_kernel_option ${CFG%%#*} ${CFG##*#} - done - done - fi fi } |
