[Lunar-commits] CVS: moonbase/kernel/linux-beta DETAILS, 1.40, 1.41 PRE_BUILD, 1.19, 1.20

[Jaime Buffery]

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

Modified Files:
	DETAILS PRE_BUILD 
Log Message:
Version bump. In PRE_BUILD: 
* the .config.beta is only imported once now, on the first source unpack.
* 2.4's .config is not included anymore, at it has been problematic.


Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-beta/DETAILS,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- DETAILS	4 Apr 2004 13:50:33 -0000	1.40
+++ DETAILS	15 Apr 2004 12:26:35 -0000	1.41
@@ -1,18 +1,18 @@
           MODULE=linux-beta
   KERNEL_VERSION=2.6.5
-          VERSION=${KERNEL_VERSION}
-#      RC_VERSION=3
-#         VERSION=2.6.5-rc${RC_VERSION}
+#         VERSION=${KERNEL_VERSION}
+      RC_VERSION=1
+         VERSION=2.6.6-rc${RC_VERSION}
           SOURCE=linux-${KERNEL_VERSION}.tar.bz2
-#         SOURCE2=patch-${VERSION}.bz2  
+         SOURCE2=patch-${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/v2.6/testing/${SOURCE2}
+     SOURCE2_URL=http://www.kernel.org/pub/linux/kernel/v2.6/testing/${SOURCE2}
       SOURCE_VFY=md5:9a76bf64c1151369b250f967d83077aa
-#     SOURCE2_VFY=md5:79c0f0a86aaa4b97c66ef759781fb60a
+     SOURCE2_VFY=md5:ad8b0f7bacf3280f5a75191b41f17e08
         WEB_SITE=http://www.kernel.org
          ENTERED=20030410
-         UPDATED=20040404
+         UPDATED=20040415
      KEEP_SOURCE="on"
            SHORT="The Linux kernel is the core of a Linux GNU Operating System."
 cat << EOF

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-beta/PRE_BUILD,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- PRE_BUILD	4 Apr 2004 13:50:33 -0000	1.19
+++ PRE_BUILD	15 Apr 2004 12:26:35 -0000	1.20
@@ -29,11 +29,16 @@
 
     cd  linux/
 
-#    patch_it  $SOURCE_CACHE/$SOURCE2  1
+    patch_it  $SOURCE_CACHE/$SOURCE2  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}"
@@ -45,11 +50,6 @@
 			    
 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