[Lunar-commits] r18835 - in moonbase/trunk/kernel: linux-2.6-ck linux-2.6-mm

[Auke Kok]

Author: sofar
Date: 2006-02-22 22:45:39 +0000 (Wed, 22 Feb 2006)
New Revision: 18835

Modified:
   moonbase/trunk/kernel/linux-2.6-ck/DETAILS
   moonbase/trunk/kernel/linux-2.6-mm/DETAILS
   moonbase/trunk/kernel/linux-2.6-mm/PRE_BUILD
Log:
Updated -mm and -ck to 2.6.15, removed microversion patch from -mm since they are not used anyway. This will give an easier to maintain set of -mm and -ck kernel set modules.


Modified: moonbase/trunk/kernel/linux-2.6-ck/DETAILS
===================================================================
--- moonbase/trunk/kernel/linux-2.6-ck/DETAILS	2006-02-22 21:44:56 UTC (rev 18834)
+++ moonbase/trunk/kernel/linux-2.6-ck/DETAILS	2006-02-22 22:45:39 UTC (rev 18835)
@@ -1,6 +1,6 @@
           MODULE=linux-2.6-ck
-       K_VERSION=2.6.12
-      CK_VERSION=ck3
+       K_VERSION=2.6.15
+      CK_VERSION=ck4
          VERSION=${K_VERSION}-${CK_VERSION}
 SOURCE_DIRECTORY=/usr/src/linux-$VERSION
           SOURCE=linux-${K_VERSION}.tar.bz2
@@ -8,12 +8,12 @@
    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://ck.kolivas.org/patches/2.6/${K_VERSION}/${VERSION}
-	SOURCE_VFY=sha1:3cb44c9202034a825959e710f94d4e536011901b
-       SOURCE2_VFY=sha1:6c8f30bae63a4e9ca0efdd8bf133f08192a5ab6b
+      SOURCE_VFY=sha1:6cfa28ef48c385948c6859cfb9f60840720a1d30
+     SOURCE2_VFY=sha1:98e4b5ecb725f0c4f69e7a0c3d74e22f42489579
 	WEB_SITE=http://www.kernel.org
          ENTERED=20041106
-         UPDATED=20050709
-           SHORT="2.6 kernel with Con Kolivas patches with emphasis on the desktop.."
+         UPDATED=20060222
+           SHORT="Con Kolivas kernel patches with emphasis on the desktop"
 KEEP_SOURCE=on
 TMPFS=off
 cat << EOF

Modified: moonbase/trunk/kernel/linux-2.6-mm/DETAILS
===================================================================
--- moonbase/trunk/kernel/linux-2.6-mm/DETAILS	2006-02-22 21:44:56 UTC (rev 18834)
+++ moonbase/trunk/kernel/linux-2.6-mm/DETAILS	2006-02-22 22:45:39 UTC (rev 18835)
@@ -1,22 +1,19 @@
           MODULE=linux-2.6-mm
-  KERNEL_VERSION=2.6.14
-      RC_VERSION=2.6.15-rc5
-      MM_VERSION=mm3
-         VERSION=${RC_VERSION}-${MM_VERSION}
+  KERNEL_VERSION=2.6.15
+      RC_VERSION=2.6.15
+      MM_VERSION=mm4
+         VERSION=$RC_VERSION-$MM_VERSION
 SOURCE_DIRECTORY=/usr/src/linux-$VERSION
-          SOURCE=linux-${KERNEL_VERSION}.tar.bz2
-         SOURCE2=patch-${RC_VERSION}.bz2
-         SOURCE3=${VERSION}.bz2
-   SOURCE_URL[0]=${KERNEL_URL}/pub/linux/kernel/v2.6/
+          SOURCE=linux-$KERNEL_VERSION.tar.bz2
+         SOURCE2=$VERSION.bz2
+   SOURCE_URL[0]=$KERNEL_URL/pub/linux/kernel/v2.6/
    SOURCE_URL[1]=http://www.kernel.org/pub/linux/kernel/v2.6/
-     SOURCE2_URL=ftp://www.kernel.org/pub/linux/kernel/v2.6/testing/ 
-     SOURCE3_URL=ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/${RC_VERSION}/${VERSION}/
-      SOURCE_VFY=sha1:e8024d1c65b5fd14be0d64904ff9bb904a290526
-     SOURCE2_VFY=sha1:671026c45ec1f9d5c325f8e4697f95d9377faa37
-     SOURCE3_VFY=sha1:69ae8b2d02efef7cd6f55176e478e85bc5d0b4a7
+     SOURCE2_URL=ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/$RC_VERSION/$VERSION/
+      SOURCE_VFY=sha1:6cfa28ef48c385948c6859cfb9f60840720a1d30
+     SOURCE2_VFY=sha1:13b8828fef06700b8eca2477791e7fa40a3cf5b4
         WEB_SITE=http://www.kernel.org
          ENTERED=20041013
-         UPDATED=20051223
+         UPDATED=20060222
            SHORT="2.6 kernel with Andrew Morton's latest test patches."
      KEEP_SOURCE=on
            TMPFS=off

Modified: moonbase/trunk/kernel/linux-2.6-mm/PRE_BUILD
===================================================================
--- moonbase/trunk/kernel/linux-2.6-mm/PRE_BUILD	2006-02-22 21:44:56 UTC (rev 18834)
+++ moonbase/trunk/kernel/linux-2.6-mm/PRE_BUILD	2006-02-22 22:45:39 UTC (rev 18835)
@@ -19,8 +19,7 @@
     
     cd linux
     
-    patch_it ${SOURCE2} 1
-    patch_it ${SOURCE3} 1
+    patch_it ${SOURCE2} 1 || exit 1
 
     for config in .config-2.6-mm .config.2.6.stable
     do