[Lunar-commits] CVS: moonbase/kernel/linux-beta DETAILS, 1.25, 1.26 PRE_BUILD, 1.11, 1.12 BUILD, 1.10, 1.11

[Jaime Buffery]

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

Modified Files:
	DETAILS PRE_BUILD BUILD 
Log Message:
* Version bump
* Copy System.map to boot
* If sources are already there, do not unpack and patch again


Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-beta/DETAILS,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- DETAILS	26 Jan 2004 09:48:51 -0000	1.25
+++ DETAILS	31 Jan 2004 09:24:53 -0000	1.26
@@ -1,6 +1,6 @@
           MODULE=linux-beta
   KERNEL_VERSION=2.6.1
-      RC_VERSION=2
+      RC_VERSION=3
          VERSION=2.6.2-rc${RC_VERSION}
           SOURCE=linux-${KERNEL_VERSION}.tar.bz2
          SOURCE2=patch-${VERSION}.bz2  
@@ -8,10 +8,10 @@
    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}
       SOURCE_VFY=md5:fa82d1e4be518261b2eeb78eabf9cca7
-     SOURCE2_VFY=md5:1d7658fc92ae73e6cd4e28b81edf8181
+     SOURCE2_VFY=md5:24c56063b389eb6384b6ad9d66a887cd
         WEB_SITE=http://www.kernel.org
          ENTERED=20030410
-         UPDATED=20040126
+         UPDATED=20040131
      KEEP_SOURCE="on"
            SHORT="The Linux kernel is the core of a Linux GNU Operating System."
 cat << EOF
@@ -27,3 +27,4 @@
 EOF
 
 
+

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-beta/PRE_BUILD,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- PRE_BUILD	21 Jan 2004 19:57:21 -0000	1.11
+++ PRE_BUILD	31 Jan 2004 09:24:53 -0000	1.12
@@ -7,32 +7,49 @@
   exit;
 fi
 
-cd       /usr/src
-rm  -rf  linux-${KERNEL_VERSION} # we remove this one just in case
-rm  -rf  linux-${VERSION}
-rm  -rf  linux
+cd /usr/src
 
-unpack  $SOURCE
+if [ ! -d linux-${VERSION} ]; then
+    
+    rm  -rf  linux-${KERNEL_VERSION} # we remove this one just in case
+    rm  -rf  linux-${VERSION}
+    rm  -rf  linux
 
-# the main kernel tarball unpacks with 2.6.X name, not with the -mm added
-# so, f.e.: linux-2.6.X will be renamed as linux-2.6.X-mmY
+    unpack  $SOURCE
 
-mv linux-${KERNEL_VERSION} linux-${VERSION}
+    # the main kernel tarball unpacks with 2.6.X name, not with the -mm added
+    # so, f.e.: linux-2.6.X will be renamed as linux-2.6.X-mmY
 
-ln  -sf     linux-${VERSION}  linux
+    mv linux-${KERNEL_VERSION} linux-${VERSION}
 
+    ln  -sf     linux-${VERSION}  linux
+
+    chown root.root /usr/src/linux
+    chown -R root.root /usr/src/linux-${VERSION}
+
+    cd linux/
+
+    patch_it $SOURCE_CACHE/$SOURCE2 1
+
+    EXTRAVERSION=`grep -m 1 "EXTRAVERSION =" Makefile`
+    sed -i "s/$EXTRAVERSION/$EXTRAVERSION-beta/g" Makefile
+
+else
+
+    message "Sources found: /usr/src/linux-${VERSION}"
+        
+    if [ "`readlink linux`" != "linux-${VERSION}" ]; then
+	rm -rf linux
+	ln -s linux-${VERSION} linux
+    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
 
-chown root.root /usr/src/linux
-chown -R root.root /usr/src/linux-${VERSION}
-
-cd /usr/src/linux
 
-patch_it $SOURCE_CACHE/$SOURCE2 1
 
-EXTRAVERSION=`grep -m 1 "EXTRAVERSION =" Makefile`
-sed -i "s/$EXTRAVERSION/$EXTRAVERSION-beta/g" Makefile

Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-beta/BUILD,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- BUILD	5 Dec 2003 22:09:25 -0000	1.10
+++ BUILD	31 Jan 2004 09:24:53 -0000	1.11
@@ -51,5 +51,6 @@
     make  modules_install #             &&
 
     cp arch/i386/boot/bzImage /boot/${VERSION}-beta 
+    cp System.map             /boot/System.map-${VERSION}
 
 ) > $C_FIFO 2>&1