[Lunar-commits] CVS: moonbase/kernel/linux-beta-mm PRE_BUILD, 1.14, 1.15 DETAILS, 1.39, 1.40

[Jaime Buffery]

Update of /var/cvs/lunar/moonbase/kernel/linux-beta-mm
In directory dbguin.lunar-linux.org:/tmp/cvs-serv22970

Modified Files:
	PRE_BUILD DETAILS 
Log Message:
version bump. .config.beta is included only on source unpack (only once) and
2.4's config is not included anymore


Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-beta-mm/PRE_BUILD,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- PRE_BUILD	5 Apr 2004 17:38:24 -0000	1.14
+++ PRE_BUILD	19 Apr 2004 12:08:56 -0000	1.15
@@ -30,10 +30,15 @@
     cd /usr/src/linux
 
     patch_it $SOURCE_CACHE/$SOURCE2 1
+    patch_it $SOURCE_CACHE/$SOURCE3 1
 
     EXTRAVERSION=`grep -m 1 "EXTRAVERSION =" Makefile`
     sed -i "s/$EXTRAVERSION/$EXTRAVERSION-beta/g" Makefile
 
+    if  [  -f   $CONFIG_CACHE/.config.beta  ];  then
+	cp  $CONFIG_CACHE/.config.beta  /usr/src/linux/.config 
+    fi
+
 else
 
     message "Sources found: /usr/src/linux-${VERSION}"
@@ -44,10 +49,3 @@
     fi
 
 fi
-
-if  [  -f   $CONFIG_CACHE/.config.beta  ];  then
-  cp        $CONFIG_CACHE/.config.beta  /usr/src/linux/.config 
-elif  [  -f   $CONFIG_CACHE/.config  ];  then
-  cp        $CONFIG_CACHE/.config  /usr/src/linux  
-fi
-

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-beta-mm/DETAILS,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- DETAILS	11 Apr 2004 09:57:21 -0000	1.39
+++ DETAILS	19 Apr 2004 12:08:56 -0000	1.40
@@ -1,17 +1,21 @@
           MODULE=linux-beta-mm
   KERNEL_VERSION=2.6.5
-      MM_VERSION=mm4
-         VERSION=${KERNEL_VERSION}-${MM_VERSION}
+      RC_VERSION=2.6.6-rc1
+      MM_VERSION=mm1
+         VERSION=${RC_VERSION}-${MM_VERSION}
           SOURCE=linux-${KERNEL_VERSION}.tar.bz2
-	 SOURCE2=${VERSION}.bz2 
+         SOURCE2=patch-${RC_VERSION}.bz2  
+	 SOURCE3=${VERSION}.bz2 
    SOURCE_URL[0]=${KERNEL_URL}/pub/linux/kernel/v2.6/${SOURCE}
    SOURCE_URL[1]=http://www.kernel.org/pub/linux/kernel/v2.6/${SOURCE}
-     SOURCE2_URL=http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/${KERNEL_VERSION}/${VERSION}/${SOURCE2}
+     SOURCE2_URL=http://www.kernel.org/pub/linux/kernel/v2.6/testing/${SOURCE2}
+     SOURCE3_URL=http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/${RC_VERSION}/${VERSION}/${SOURCE3}
       SOURCE_VFY=md5:9a76bf64c1151369b250f967d83077aa  
-     SOURCE2_VFY=md5:d29a74284b6fd1e28eea6dc29d2c135a 
+     SOURCE2_VFY=md5:ad8b0f7bacf3280f5a75191b41f17e08
+     SOURCE3_VFY=md5:fa04e54c84f2978b6d6e5ce3460a60bf
         WEB_SITE=http://www.kernel.org
          ENTERED=20031228
-         UPDATED=20040411
+         UPDATED=20040419
      KEEP_SOURCE="on"
            SHORT="2.6 kernel with Andrew Morton's latest test patches."
 cat << EOF