[Lunar-commits] CVS: moonbase/kernel/linux-2.6 DETAILS, 1.2, 1.3 PRE_BUILD, 1.5, 1.6

[Moritz Heiber]

Update of /var/cvs/lunar/moonbase/kernel/linux-2.6
In directory espresso.foo-projects.org:/tmp/cvs-serv1732

Modified Files:
	DETAILS PRE_BUILD 
Log Message:
>From now on 2.6.x is going to be at least bit more secure.
I'm adding the AS patchset as the default 'choice'


Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6/DETAILS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DETAILS	27 Dec 2004 16:41:50 -0000	1.2
+++ DETAILS	25 Jan 2005 17:18:11 -0000	1.3
@@ -1,12 +1,16 @@
           MODULE=linux-2.6
          VERSION=2.6.10
           SOURCE=linux-${VERSION}.tar.bz2
+	 AS_NAME=patch-2.6.10-as2
+	 SOURCE2=${AS_NAME}.gz
    SOURCE_URL[0]=$KERNEL_URL/pub/linux/kernel/v2.6/
    SOURCE_URL[1]=http://www.kernel.org/pub/linux/kernel/v2.6/
+  SOURCE2_URL[0]=http://www.acm.cs.rpi.edu/~dilinger/patches/2.6.10/as1/
       SOURCE_VFY=sha1:3c83791c20f9a397b287825a9a5984010a07e711
+     SOURCE2_VFY=sha1:1a709306ad1ef0a91104c6d6c1272a53e0b70768
 	WEB_SITE=http://www.kernel.org
          ENTERED=20041019
-         UPDATED=20041227
+         UPDATED=20050125
            SHORT="The Linux kernel is the core of a Linux GNU Operating System."
 cat << EOF
 This is the stable version of the 2.6.x branch.

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6/PRE_BUILD,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PRE_BUILD	1 Jan 2005 09:47:11 -0000	1.5
+++ PRE_BUILD	25 Jan 2005 17:18:11 -0000	1.6
@@ -1,32 +1,22 @@
-cd $BUILD_DIRECTORY
-
-if [ ! -d linux-${VERSION} ]; then
-    
-    rm  -rf  linux-${VERSION}
-    rm  -rf  linux
-
-    unpack  $SOURCE
-
-    ln  -sf  linux-${VERSION}  linux
-
-    chown  root.root  $BUILD_DIRECTORY/linux
-    chown  -R  root.root  $BUILD_DIRECTORY/linux-${VERSION}
+# Bail if we're not running a core with kernel fuctions
 
-else
+if [ ! -e $FUNCTIONS/kernel.lunar ] ; then
+  message "${PROBLEM_COLOR}Bailing out, ${DEFAULT_COLOR}Lunar (or theedge) code version too old"
+  message "${PROBLEM_COLOR}Update core ${MODULE_COLOR}(lin lunar or lin theedge)${DEFAULT_COLOR} to install this kernel"
+  exit 1
+fi
 
-    message "Sources found: $BUILD_DIRECTORY/linux-${VERSION}"
-    if ! validate_source_dir ; then
-      exit 1
-    else
-      if [ "`readlink linux`" != "linux-${VERSION}" ]; then
-        rm -rf linux
-	ln -s linux-${VERSION} linux
-      fi
-    fi
+if [ -e /usr/src/linux -a ! -h /usr/src/linux ]; then
+  message "${PROBLEM_COLOR}Error:${DEFAULT_COLOR} /usr/src/linux must be a symbolic link"
+  exit 1
 fi
-    
 
-cd  linux/
+mk_source_dir $SOURCE_DIRECTORY
+rm -f /usr/src/linux
+ln -s $SOURCE_DIRECTORY /usr/src/linux
+cd $SOURCE_DIRECTORY
+
+tar xf $SOURCE_CACHE/$SOURCE --no-same-owner --no-same-permissions --strip-components=1
 
 if  [ -f $CONFIG_CACHE/.config.2.6.stable ]; then
     cp $CONFIG_CACHE/.config.2.6.stable $BUILD_DIRECTORY/linux/.config;
@@ -34,3 +24,5 @@
     cp $CONFIG_CACHE/.config.beta $BUILD_DIRECTORY/linux/.config;
 fi
 
+( cp $SOURCE_CACHE/$SOURCE2 $SOURCE_DIRECTORY/ && gunzip $SOURCE2 ) &&
+patch_it $AS_NAME 1