[Lunar-commits] CVS: moonbase/kernel/linux-2.6 PRE_BUILD,1.1,1.2

[Jens Luedicke]

Update of /var/cvs/lunar/moonbase/kernel/linux-2.6
In directory espresso.foo-projects.org:/tmp/cvs-serv30446/kernel/linux-2.6

Modified Files:
	PRE_BUILD 
Log Message:
update linux-2.6-ck and linux-2.6-cko modules
(based on the new linux-2.6 module rewritten by Moe)




Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6/PRE_BUILD,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PRE_BUILD	19 Oct 2004 08:15:32 -0000	1.1
+++ PRE_BUILD	27 Dec 2004 19:09:24 -0000	1.2
@@ -1,32 +1,43 @@
-cd $BUILD_DIRECTORY
+cd /usr/src
 
-if [ ! -d linux-${VERSION} ]; then
+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
 
     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
 
-    chown  root.root  $BUILD_DIRECTORY/linux
-    chown  -R  root.root  $BUILD_DIRECTORY/linux-${VERSION}
+    mv linux-${KERNEL_VERSION} linux-${VERSION}
 
-    cd  linux/
+    ln  -sf     linux-${VERSION}  linux
+    
+    chown root.root /usr/src/linux
+    chown root.root /usr/src/linux-${VERSION}
+    message "Cd into dir"
+    sleep 1
+    cd /usr/src/linux
 
-    if  [ -f $CONFIG_CACHE/.config.2.6.stable ]; then
-	cp $CONFIG_CACHE/.config.2.6.stable $BUILD_DIRECTORY/linux/.config;
-    elif [ -f $CONFIG_CACHE/.config.beta ]; then
-	cp $CONFIG_CACHE/.config.beta $BUILD_DIRECTORY/linux/.config;
-    fi
+    patch_it $SOURCE_CACHE/$SOURCE2 1
+
+    if  [  -f   $CONFIG_CACHE/.config-2.6.ck  ];  then
+	message "---------------------Using config-2.6.ck------------------"
+	cp  $CONFIG_CACHE/.config-2.6.ck  /usr/src/linux/.config 
+    elif [ -f  $CONFIG_CACHE/.config.2.6.stable ]; then
+	message "-------------------Using config-2.6-------------------"
+	cp  $CONFIG_CACHE/.config.2.6.stable  /usr/src/linux/.config 
+   fi 
 
 else
 
-    message "Sources found: $BUILD_DIRECTORY/linux-${VERSION}"
-        
+    message "Sources found: /usr/src/linux-${VERSION}"
+    
     if [ "`readlink linux`" != "linux-${VERSION}" ]; then
-	rm -rf linux
+	rm -rf linux	
 	ln -s linux-${VERSION} linux
     fi
-			    
+
 fi