[Lunar-commits] CVS: moonbase/kernel/linux-2.6 DETAILS, 1.8, 1.9 PRE_BUILD, 1.8, 1.9

[Moritz Heiber]

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

Modified Files:
	DETAILS PRE_BUILD 
Log Message:
Linux 2.6.x update and Linux 2.4.x identation fixes. Almost
didn't see the KEEP_SOURCES=on ;-)


Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6/DETAILS,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- DETAILS	4 Mar 2005 21:44:18 -0000	1.8
+++ DETAILS	7 Mar 2005 13:24:18 -0000	1.9
@@ -1,27 +1,22 @@
           MODULE=linux-2.6
-         VERSION=2.6.10
-          SOURCE=linux-${VERSION}.tar.bz2
-      AS_VERSION=as6
-	 AS_NAME=patch-${VERSION}-${AS_VERSION}
-	 SOURCE2=${AS_NAME}.gz
+         VERSION=2.6.11.1
+	KVERSION=2.6.11
+          SOURCE=linux-${KVERSION}.tar.bz2
+	 SOURCE2=patch-${VERSION}.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/linux-$VERSION
    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/${VERSION}/${AS_VERSION}/
-      SOURCE_VFY=sha1:3c83791c20f9a397b287825a9a5984010a07e711
-     SOURCE2_VFY=sha1:475f72e8bb634c6686ea6dbf1f1bea7b49b0f621
+  SOURCE2_URL[0]=http://kernel.org/pub/linux/kernel/people/gregkh/v${KVERSION}/
+      SOURCE_VFY=sha1:d72ab76360d004dac4b976633dd0490e8d4b15cd
+     SOURCE2_VFY=sha1:b32b687483fc49e50c6d7da34c8324725406b081
 	WEB_SITE=http://www.kernel.org
      KEEP_SOURCE=on
 	 ENTERED=20041019
-         UPDATED=20050304
+         UPDATED=20050307
            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.
 
-Lunar Linux is using the AS patchset by default since there is
-no 2.6.x specific lunar patchset yet. AS is only bringing in
-security fixes and important tweaks. It is not adding any new
-features.
-
 Linux is a clone of the Unix kernel, written from scratch by Linus
 Torvalds with assistance from a loosely-knit team of hackers across the
 Net. It aims towards POSIX and Single UNIX Specification compliance. It

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6/PRE_BUILD,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- PRE_BUILD	21 Feb 2005 13:34:57 -0000	1.8
+++ PRE_BUILD	7 Mar 2005 13:24:18 -0000	1.9
@@ -26,5 +26,5 @@
     cp $CONFIG_CACHE/.config.beta $BUILD_DIRECTORY/linux/.config;
 fi
 
-( cp $SOURCE_CACHE/$SOURCE2 $SOURCE_DIRECTORY/ && gunzip $SOURCE2 ) &&
-patch_it $AS_NAME 1
+( cp $SOURCE_CACHE/$SOURCE2 $SOURCE_DIRECTORY/ && bunzip2 $SOURCE2 ) &&
+patch_it patch-$VERSION 1