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

[Jaime Buffery]

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

Modified Files:
	PRE_BUILD DETAILS 
Log Message:
Sources are removed and then unpacked and patched now. 


Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-beta/PRE_BUILD,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- PRE_BUILD	1 Jan 2004 17:06:20 -0000	1.8
+++ PRE_BUILD	3 Jan 2004 15:12:55 -0000	1.9
@@ -8,11 +8,18 @@
 fi
 
 cd       /usr/src
+rm  -rf  linux-${KERNEL_VERSION} # we remove this one just in case
+rm  -rf  linux-${VERSION}
 rm  -rf  linux
 
 unpack  $SOURCE
 
-ln  -sf     linux-$VERSION  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
+
+mv linux-${KERNEL_VERSION} linux-${VERSION}
+
+ln  -sf     linux-${VERSION}  linux
 
 if  [  -f   $CONFIG_CACHE/.config.beta  ];  then
   cp        $CONFIG_CACHE/.config.beta  /usr/src/linux/.config 
@@ -20,11 +27,12 @@
   cp        $CONFIG_CACHE/.config  /usr/src/linux  
 fi
 
-chown -R root.root /usr/src/linux
+chown root.root /usr/src/linux
+chown -R root.root /usr/src/linux-${VERSION}
+
 cd /usr/src/linux
 
-bzcat $SOURCE_CACHE/$SOURCE2 | patch -p1
+patch_it $SOURCE_CACHE/$SOURCE2 1
 
 EXTRAVERSION=`grep -m 1 "EXTRAVERSION =" Makefile`
 sed -i "s/$EXTRAVERSION/$EXTRAVERSION-beta/g" Makefile
-#sedit 's/EXTRAVERSION = /EXTRAVERSION = -beta/g' Makefile

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-beta/DETAILS,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- DETAILS	2 Jan 2004 11:45:52 -0000	1.19
+++ DETAILS	3 Jan 2004 15:12:55 -0000	1.20
@@ -1,8 +1,8 @@
           MODULE=linux-beta
-             PKG=linux
-         VERSION=2.6.0
-          SOURCE=$PKG-$VERSION.tar.bz2
-         SOURCE2=patch-2.6.1-rc1.bz2  
+  KERNEL_VERSION=2.6.0
+         VERSION=2.6.1-rc1
+          SOURCE=linux-${KERNEL_VERSION}.tar.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}