From: Heiko Z. <smi...@us...> - 2011-09-26 18:06:39
|
Update of /cvsroot/devil-linux/build/scripts In directory vz-cvs-3.sog:/tmp/cvs-serv30307/scripts Modified Files: alsa-driver create_cd_dirs functions ipac-ng iptables linux module-init-tools prepare settings shfs udev xtables-addons Log Message: - updated aufs3 to git-20110922 - updated e1000 to 8.0.30 - updated e1000e to 1.6.2 - updated gradm to 2.2.2-201109151158 - updated grsecurity to 2.2.2-3.0.4-201109190917 - updated igb to 3.2.9 - updated ipac-ng to 1.34.1 - updated ipsec-tools to 0.8.0 - updated iptables to 1.4.12.1 - updated iscsitarget to svn-20110922 - updated open-vm-tools to 8.8.0-471268 - updated openssh to 5.9p1 - updated openvpn to 2.2.1 - updated linux kernel to 3.0.4 - updated patch-imqmq to 3.0 - updated xtables-addons to 1.39 Index: iptables =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/iptables,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- iptables 28 May 2011 04:58:04 -0000 1.37 +++ iptables 26 Sep 2011 18:06:37 -0000 1.38 @@ -24,7 +24,7 @@ bzcat $DL_DIR/src/iptables-*-imq.patch.bz2 | patch -p1 || exit 1 chmod +x extensions/.IMQ-test* fi - ./configure --prefix=/usr --with-ksource=$KERNELDIR || exit 1 + ./configure --prefix=/usr --with-ksource=$KERNELDIR --enable-devel || exit 1 #replace_str Makefile "/usr/local" "/usr" # seems like iptables comple is unhappy in some circumstances, let's see if that makes it better make clean @@ -47,7 +47,7 @@ copy_docs $TMPDIR copy_files $TMPDIR/usr/bin $CDDIR/usr || exit 1 copy_files $TMPDIR/usr/sbin $CDDIR/usr || exit 1 - copy_files $TMPDIR/usr/libexec $CDDIR/usr || exit 1 + copy_files $TMPDIR/usr/lib $CDDIR/usr || exit 1 rm -rf $TMPDIR || exit 1 ;; Index: functions =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/functions,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- functions 2 Dec 2010 18:25:58 -0000 1.71 +++ functions 26 Sep 2011 18:06:37 -0000 1.72 @@ -435,7 +435,7 @@ # will set all 'tristate' to 'm' and all 'bool' to 'yes' function set_all_kernel_options () { if [ -d $KERNELDIR/$1 ]; then - if [ "$CONFIG_LINUX_VERSION" = "2.6" ]; then + if [ "$CONFIG_LINUX_VERSION" = "2.6" ] || [ "$CONFIG_LINUX_VERSION" = "3.0" ]; 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.... Index: ipac-ng =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/ipac-ng,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ipac-ng 6 Jan 2010 15:20:24 -0000 1.14 +++ ipac-ng 26 Sep 2011 18:06:37 -0000 1.15 @@ -18,7 +18,7 @@ case $1 in build ) if [ "$CONFIG_IPAC_NG" = "y" ]; then - ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc --enable-detailed-logs=yes --enable-default-agent=iptables --enable-classic=no || exit 1 + ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc --enable-default-agent=iptables || exit 1 # parallel build fails, do not use $PMAKE make all || exit 1 strip_debug Index: prepare =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/prepare,v retrieving revision 1.89 retrieving revision 1.90 diff -u -d -r1.89 -r1.90 --- prepare 28 May 2011 04:58:04 -0000 1.89 +++ prepare 26 Sep 2011 18:06:37 -0000 1.90 @@ -25,8 +25,6 @@ prepare ) chmod +x $MYDIR/* - set -x - if [ -d /usr/src/linux ] && [ ! -L /usr/src/linux ]; then echo "ERROR" echo "/usr/src/linux found and is a directory" @@ -40,7 +38,7 @@ pushd $KERNELDIR > /dev/null if [ ! -f .minor_version_patch.done ]; then shopt -s extglob - for i in $(ls ../../src/patch-$KERNELVERSION.+([[:digit:]]).bz2) + for i in $(ls ../../src/patch-${KERNELVERSION%.*}.+([[:digit:]]).bz2) do echo applying kernel patch $i bzcat $i | patch -p1 || exit 1 @@ -147,16 +145,16 @@ if [ "$CONFIG_ETCFS" = "AUFS" ]; then echo "Patching AUFS" if [ ! -f $KERNELDIR/.done_aufs_patch ]; then - AUFSDIR=$(find_src_dir aufs2) - patch -d $KERNELDIR -p1 -i ${AUFSDIR}/aufs2-standalone/aufs2-kbuild.patch || exit 1 - patch -d $KERNELDIR -p1 -i ${AUFSDIR}/aufs2-standalone/aufs2-base.patch || exit 1 - patch -d $KERNELDIR -p1 -i ${AUFSDIR}/aufs2-standalone/aufs2-standalone.patch || exit 1 - cp -dpvR ${AUFSDIR}/aufs2-standalone/{fs,Documentation} $KERNELDIR/ || exit 1 - cp -dpvR ${AUFSDIR}/aufs2-standalone/include/linux/aufs_type.h $KERNELDIR/include/linux/ || exit 1 + AUFSDIR=$(find_src_dir aufs3) + patch -d $KERNELDIR -p1 -i ${AUFSDIR}/aufs3-standalone/aufs3-kbuild.patch || exit 1 + patch -d $KERNELDIR -p1 -i ${AUFSDIR}/aufs3-standalone/aufs3-base.patch || exit 1 + patch -d $KERNELDIR -p1 -i ${AUFSDIR}/aufs3-standalone/aufs3-standalone.patch || exit 1 + cp -dpvR ${AUFSDIR}/aufs3-standalone/{fs,Documentation} $KERNELDIR/ || exit 1 + cp -dpvR ${AUFSDIR}/aufs3-standalone/include/linux/aufs_type.h $KERNELDIR/include/linux/ || exit 1 bzcat $DL_DIR/src/aufs2-pax-fix.patch.bz2 | patch -d $KERNELDIR -p1 || exit 1 touch $KERNELDIR/.done_aufs_patch fi - set_kernel_option CONFIG_AUFS_FS m + set_kernel_option CONFIG_AUFS_FS y set_kernel_option CONFIG_AUFS_HINOTIFY n set_kernel_option CONFIG_AUFS_HNOTIFY y set_kernel_option CONFIG_AUFS_SP_IATTR n Index: settings =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/settings,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- settings 28 May 2011 04:58:04 -0000 1.61 +++ settings 26 Sep 2011 18:06:37 -0000 1.62 @@ -57,10 +57,11 @@ CONF_HOST="i$CONFIG_CPU-pc-linux-gnu" KERNELDIR=$(find_src_dir linux-$CONFIG_LINUX_VERSION) -KERNELVERSION=$(make -s -C $KERNELDIR kernelrelease 2> /dev/null | grep ^2\.6 | grep -vi "directory" | grep -vi error) +KERNELVERSION=$(make -s -C $KERNELDIR kernelrelease 2> /dev/null | grep ^3\. | grep -vi "directory" | grep -vi error) if [ -z "$KERNELVERSION" ]; then - KERNELVERSION=$(make -s -C $KERNELDIR kernelversion 2> /dev/null | grep ^2\.6 | grep -vi "directory" | grep -vi error) + KERNELVERSION=$(make -s -C $KERNELDIR kernelversion 2> /dev/null | grep ^3\. | grep -vi "directory" | grep -vi error) fi +#KERNELVERSION=${KERNELVERSION%.*} SRCDIR=$DL_DIR/src SRCEXTRADIR=$DL_DIR/src-extra @@ -99,8 +100,7 @@ BUTTON_EXIT_SUB="' Back '" BUTTON_HELP="' Help '" -test "$CONFIG_LINUX_VERSION" = "2.6" && CONFIG_GLIBC_NPTL=y -test "$CONFIG_LINUX_VERSION" = "2.4" && CONFIG_GLIBC_NPTL=n +CONFIG_GLIBC_NPTL=y # create a unique tmp directory for each script # this will make us thread safe Index: shfs =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/shfs,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- shfs 6 Jan 2010 15:27:21 -0000 1.5 +++ shfs 26 Sep 2011 18:06:37 -0000 1.6 @@ -18,7 +18,7 @@ MYNAME=SHFS -test "$CONFIG_LINUX_VERSION" = "2.6" && exit 0 +exit 0 case $1 in build ) Index: linux =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/linux,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- linux 18 Mar 2010 05:54:35 -0000 1.72 +++ linux 26 Sep 2011 18:06:37 -0000 1.73 @@ -19,10 +19,12 @@ case $1 in build ) - if [ "$CONFIG_LINUX_VERSION" = "2.6" ] && [ ! -e drivers/video/logo/logo_linux_clut224.ppm.org ]; then + if [ "$CONFIG_LINUX_VERSION" = "2.6" ] || [ "$CONFIG_LINUX_VERSION" = "3.0" ]; then + if [ ! -e drivers/video/logo/logo_linux_clut224.ppm.org ]; then # Replace default penguin cp -f drivers/video/logo/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm.org cp -f $DL_DIR/other/fblogo.pnm drivers/video/logo/logo_linux_clut224.ppm + fi fi if [ -e .config.add ]; then Index: create_cd_dirs =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/create_cd_dirs,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- create_cd_dirs 25 May 2011 13:59:08 -0000 1.35 +++ create_cd_dirs 26 Sep 2011 18:06:37 -0000 1.36 @@ -35,7 +35,9 @@ # the initrd tree DIRS='cd cdrom dev floppy lib proc sbin tmp shm' mk_dir $INITRDDIR $DIRS - test "$CONFIG_LINUX_VERSION" = "2.6" && mk_dir $INITRDDIR sys + if [ "$CONFIG_LINUX_VERSION" = "2.6" ] || [ "$CONFIG_LINUX_VERSION" = "3.0" ]; then + mk_dir $INITRDDIR sys + fi # create links ln -s sbin $INITRDDIR/bin @@ -45,7 +47,9 @@ DIRS='bin boot cd cdrom floppy initrd lib proc sbin var home' mk_dir $CDDIR $DIRS - test "$CONFIG_LINUX_VERSION" = "2.6" && mk_dir $CDDIR sys + if [ "$CONFIG_LINUX_VERSION" = "2.6" ] || [ "$CONFIG_LINUX_VERSION" = "3.0" ]; then + mk_dir $CDDIR sys + fi DIRS='bin doc include info lib man sbin share src' mk_dir $CDDIR/usr $DIRS Index: udev =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/udev,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- udev 6 Jan 2010 15:27:21 -0000 1.15 +++ udev 26 Sep 2011 18:06:37 -0000 1.16 @@ -16,8 +16,6 @@ EXTRA_FLAGS="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" - -set -x case $1 in build ) Index: xtables-addons =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/xtables-addons,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- xtables-addons 28 Feb 2010 10:06:41 -0000 1.2 +++ xtables-addons 26 Sep 2011 18:06:37 -0000 1.3 @@ -18,6 +18,7 @@ build ) if [ "$CONFIG_NF_PATCHES" = "y" ]; then ./configure --prefix=/usr --with-kbuild=$KERNELDIR || exit 1 + echo "build_ipset6=n" >> mconfig make || exit 1 strip_debug fi Index: module-init-tools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/module-init-tools,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- module-init-tools 6 Jan 2010 15:20:24 -0000 1.9 +++ module-init-tools 26 Sep 2011 18:06:37 -0000 1.10 @@ -14,8 +14,6 @@ # source functions and config source $MYDIR/settings -test ! "$CONFIG_LINUX_VERSION" = "2.6" && exit 0 - case $1 in build ) ./configure --prefix="" --enable-zlib || exit 1 Index: alsa-driver =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/alsa-driver,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- alsa-driver 6 Jan 2010 14:53:27 -0000 1.15 +++ alsa-driver 26 Sep 2011 18:06:37 -0000 1.16 @@ -19,8 +19,8 @@ MYNAME=ALSA-DRIVER -# exit when this is kernel 2.6, since it's all already included in the kernel -test "$CONFIG_LINUX_VERSION" = "2.6" && exit 0 +# this is included in the kernel now +exit 0 case $1 in build ) |