[Devil-linux-commit] build/scripts create_cd_dirs,1.26,1.27 ipsec-tools,1.2,1.3

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

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

Modified Files:
	create_cd_dirs ipsec-tools 
Log Message:
added sys directory when kernel 2.6 is used (Heiko + Oliver Jehle)
updated ipsec-tools to v0.3-rc1
make sure some packages are only available for the correct kernel


Index: create_cd_dirs
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/create_cd_dirs,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- create_cd_dirs	11 Jan 2004 14:43:04 -0000	1.26
+++ create_cd_dirs	11 Mar 2004 01:47:28 -0000	1.27
@@ -44,6 +44,7 @@
 			# the initrd tree
 			DIRS='cdrom dev floppy lib proc sbin tmp shm mnt'
 			mk_dir $INITRDDIR $DIRS
+			test "$CONFIG_LINUX_VERSION" = "2.6" && mk_dir $INITRDDIR sys
 
 			# create links
 			ln -s sbin $INITRDDIR/bin
@@ -53,6 +54,8 @@
 			DIRS='bin boot cdrom dev/pts floppy initrd lib mnt proc sbin var home'
 			mk_dir $CDDIR $DIRS
 
+			test "$CONFIG_LINUX_VERSION" = "2.6" && mk_dir $CDDIR sys
+
 			DIRS='bin doc include info lib man sbin share src'
 			mk_dir $CDDIR/usr $DIRS
 			mk_dir $CDDIR/usr/local $DIRS

Index: ipsec-tools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ipsec-tools,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ipsec-tools	16 Jan 2004 19:16:56 -0000	1.2
+++ ipsec-tools	11 Mar 2004 01:47:28 -0000	1.3
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 # $Source$
 # $Revision$
 # $Date$
@@ -24,19 +24,14 @@
 source $MYDIR/settings
 
 # not supported without backport of ipsec from kernel 2.6
-test ! "$CONFIG_LINUX_VERSION" = "2.4" && exit 0
+test ! "$CONFIG_LINUX_VERSION" = "2.6" && exit 0
 
-test ! "$CONFIG_IPSEC_TOOL" = "y" && exit 0
+test ! "$CONFIG_IPSEC_TOOLS" = "y" && exit 0
 
 
 case $1 in
     build )
 	./bootstrap
-	cd src/racoon
-	aclocal
-	automake
-	autoconf
-	cd ../..
 	./configure --prefix=/usr --sysconfdir=/etc/ipsec-tools --with-kernel-headers=$KERNELDIR/include
 	make  || exit 1
 	make install || exit 1