[Devil-linux-commit] build/scripts prepare,1.50,1.51

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

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28631/scripts

Modified Files:
	prepare 
Log Message:
- updated lcd4linux to cvs20041230
- updated kernel to v2.6.10
- updated LVM2 to v2.00.32
- updated mysql to v4.1.3a
- use for now kernel 2.6.8.1 includes, until all the issues are resolved  


Index: prepare
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/prepare,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- prepare	10 Sep 2004 23:16:24 -0000	1.50
+++ prepare	30 Dec 2004 19:36:48 -0000	1.51
@@ -66,9 +66,20 @@
 	    rm /usr/include/linux
 	fi
 	
-	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
+	# 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
 
 	;;