[Lunar-commits] CVS: moonbase/kernel/linux-beta-mm DETAILS, 1.14, 1.15 BUILD, 1.1, 1.2 PRE_BUILD, 1.6, 1.7

[Jaime Buffery]

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

Modified Files:
	DETAILS BUILD PRE_BUILD 
Log Message:
* Bump version
* copy System.map to boot
* don't unpack and patch if sources are already there


Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-beta-mm/DETAILS,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- DETAILS	26 Jan 2004 22:45:41 -0000	1.14
+++ DETAILS	30 Jan 2004 11:46:43 -0000	1.15
@@ -1,7 +1,7 @@
           MODULE=linux-beta-mm
   KERNEL_VERSION=2.6.1
-      RC_VERSION=2.6.2-rc1
-      MM_VERSION=mm1
+      RC_VERSION=2.6.2-rc2
+      MM_VERSION=mm2
          VERSION=${RC_VERSION}-${MM_VERSION}
           SOURCE=linux-${KERNEL_VERSION}.tar.bz2
          SOURCE2=patch-${RC_VERSION}.bz2
@@ -11,11 +11,11 @@
      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:fa82d1e4be518261b2eeb78eabf9cca7
-     SOURCE2_VFY=md5:0f9885e1262d6abc453787088ce7c398
-     SOURCE3_VFY=md5:c8ddaa1cd6a3d29490a2c04e6a2b5871
+     SOURCE2_VFY=md5:1d7658fc92ae73e6cd4e28b81edf8181
+     SOURCE3_VFY=md5:718377237f28f0d92f86d451b4057e1a
         WEB_SITE=http://www.kernel.org
          ENTERED=20031228
-         UPDATED=20040122
+         UPDATED=20040130
      KEEP_SOURCE="on"
            SHORT="2.6 kernel with Andrew Morton's latest test patches."
 cat << EOF
@@ -29,6 +29,3 @@
 demand loading, shared copy-on-write executables, proper memory
 management, and TCP/IP networking.
 EOF
-
-
-

Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-beta-mm/BUILD,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BUILD	29 Dec 2003 11:15:21 -0000	1.1
+++ BUILD	30 Jan 2004 11:46:43 -0000	1.2
@@ -51,5 +51,6 @@
     make  modules_install #        &&
 
     cp arch/i386/boot/bzImage /boot/${VERSION} 
+    cp System.map             /boot/System.map-${VERSION}	
 
 ) > $C_FIFO 2>&1

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-beta-mm/PRE_BUILD,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PRE_BUILD	22 Jan 2004 11:40:43 -0000	1.6
+++ PRE_BUILD	30 Jan 2004 11:46:43 -0000	1.7
@@ -7,19 +7,44 @@
   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 /usr/src/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 root.root /usr/src/linux-${VERSION}
+
+    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
+
+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 
@@ -27,12 +52,3 @@
   cp        $CONFIG_CACHE/.config  /usr/src/linux  
 fi
 
-chown root.root /usr/src/linux
-chown root.root /usr/src/linux-${VERSION}
-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