[Devil-linux-commit] build/scripts dosfstools,1.7,1.8 lilo,1.10,1.11 pwlib,1.11,1.12 reiserfsprogs,1.13,1.14 strace,1.11,1.12 sysklogd,1.11,1.12

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

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

Modified Files:
	dosfstools lilo pwlib reiserfsprogs strace sysklogd 
Log Message:
use old kernel headers only when we use kernel 2.6


Index: dosfstools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/dosfstools,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- dosfstools	14 Jan 2004 21:31:36 -0000	1.7
+++ dosfstools	16 Jan 2004 19:22:48 -0000	1.8
@@ -38,7 +38,7 @@
 			touch dosfsutils-patches.done
 		fi
 
-		old_kernel_includes
+		test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes
 		make $PMAKE || exit 1
 		strip_debug
 	    fi

Index: lilo
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/lilo,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- lilo	14 Jan 2004 03:32:26 -0000	1.10
+++ lilo	16 Jan 2004 19:22:48 -0000	1.11
@@ -28,7 +28,7 @@
 
 
 		disable_et_dyn
-		old_kernel_includes
+		test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes
 	    make $PMAKE || exit 1
 	    strip_debug
             ;;

Index: pwlib
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/pwlib,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- pwlib	16 Jan 2004 01:47:55 -0000	1.11
+++ pwlib	16 Jan 2004 19:22:48 -0000	1.12
@@ -32,7 +32,7 @@
 	    if [ "$CONFIG_PWLIB" = "y" ]; then
 		rm -f /usr/lib/libpt_linux_x86_r.so /usr/lib/libpt.so
 		export PWLIBDIR=$PWD
-		old_kernel_includes
+		test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes
 		./configure --prefix=/usr || exit 1
 		# parallel builds fails ($PMAKE)
 		make || exit 1

Index: reiserfsprogs
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/reiserfsprogs,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- reiserfsprogs	14 Jan 2004 03:32:26 -0000	1.13
+++ reiserfsprogs	16 Jan 2004 19:22:48 -0000	1.14
@@ -26,7 +26,7 @@
 case $1 in
     build )
 		disable_et_dyn
-		old_kernel_includes
+		test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes
 		./configure --prefix=  || exit 1
 		make $PMAKE all || exit 1
 		strip_debug

Index: strace
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/strace,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- strace	14 Jan 2004 03:32:26 -0000	1.11
+++ strace	16 Jan 2004 19:22:48 -0000	1.12
@@ -25,7 +25,7 @@
 
 case $1 in
     build )
-	old_kernel_includes
+	test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes
 	./configure --prefix=/usr || exit 1
 	make $PMAKE all || exit 1
 	strip_debug

Index: sysklogd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/sysklogd,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- sysklogd	14 Jan 2004 03:32:26 -0000	1.11
+++ sysklogd	16 Jan 2004 19:22:48 -0000	1.12
@@ -25,7 +25,7 @@
 
 case $1 in
 	build )
-		old_kernel_includes
+		test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes
 		make $PMAKE || exit 1
 		strip_debug
 		;;