[Devil-linux-commit] build/scripts LVM,1.15,1.16 LVM2,1.2,1.3 super-freeswan,1.4,1.5 xfsprogs,1.21,1.22

[<smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv27442/scripts

Modified Files:
	LVM LVM2 super-freeswan xfsprogs 
Log Message:
get xfs working under 2.6
make sure selection of program get's included is done only in menuconfig


Index: LVM
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/LVM,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- LVM	16 Jan 2004 01:47:55 -0000	1.15
+++ LVM	17 Jan 2004 01:15:39 -0000	1.16
@@ -24,8 +24,6 @@
 source $MYDIR/settings
 
 MYNAME=LVM
-test ! "$CONFIG_LINUX_VERSION" = "2.4" && exit 0
-test  "$CONFIG_LVM2" = "y" && exit 0
 
 case $1 in
     build )

Index: LVM2
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/LVM2,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- LVM2	16 Jan 2004 02:06:42 -0000	1.2
+++ LVM2	17 Jan 2004 01:15:39 -0000	1.3
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 # $Source$
 # $Revision$
 # $Date$
@@ -28,9 +28,9 @@
 case $1 in
     build )
 	if [ "$CONFIG_LVM2" = "y" ]; then
-		pushd `pwd` 
+		pushd `pwd`
 		cd ../device-mapper*
-		# 
+		#
 		# patch the device mapper into 2.4
 		#
 		if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
@@ -39,9 +39,8 @@
    			patch -p1 -d ../linux-2.4.24 <`pwd`/patches/linux-2.4.22-VFS-lock.patch || exit 1
 			set_kernel_option CONFIG_BLK_DEV_DM y
 			set_kernel_option CONFIG_BLK_DEV_DM_MIRROR m
-		else
-			./configure
 		fi
+		./configure
 		make $PMAKE  || exit 1
 		make install || exit 1
 		popd 

Index: super-freeswan
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/super-freeswan,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- super-freeswan	16 Jan 2004 01:47:55 -0000	1.4
+++ super-freeswan	17 Jan 2004 01:15:39 -0000	1.5
@@ -25,9 +25,6 @@
 
 MYNAME=FREESWAN
 
-# not supported in moment with kernel 2.6
-test ! "$CONFIG_LINUX_VERSION" = "2.4" && exit 0
-
 case $1 in
 	build )
 		if [ "$CONFIG_SUPER_FREESWAN" = "y" ]; then

Index: xfsprogs
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/xfsprogs,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- xfsprogs	16 Jan 2004 01:47:55 -0000	1.21
+++ xfsprogs	17 Jan 2004 01:15:39 -0000	1.22
@@ -28,13 +28,13 @@
 case $1 in
     build )
 	if [ "$CONFIG_XFS" = "y" ]; then
-		pushd $KERNELDIR > /dev/null
-		if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then 
+		if [ "$CONFIG_LINUX_VERSION" = "2.4" ]; then
+			pushd $KERNELDIR > /dev/null
 		        pushd $KERNELDIR > /dev/null
-               	       	echo "patching Kernel ..."
-	               	XFSPATCH=$(ls $DL_DIR/src/xfs*-all*.bz2)
-	               	bzcat $XFSPATCH | patch -p1 || exit 1
-		       	if [ "$CONFIG_ACL" = "y" ]; then
+			echo "patching Kernel ..."
+			XFSPATCH=$(ls $DL_DIR/src/xfs*-all*.bz2)
+			bzcat $XFSPATCH | patch -p1 || exit 1
+			if [ "$CONFIG_ACL" = "y" ]; then
 				set_kernel_option CONFIG_FS_POSIX_ACL y
 			else
 				set_kernel_option CONFIG_FS_POSIX_ACL n