[Lunar-commits] CVS: moonbase/kernel/linux-2.6 BUILD, 1.1, 1.2 CONFIGURE, 1.1, 1.2 DETAILS, 1.1, 1.2 POST_INSTALL, 1.1, 1.2 BUILD.alpha, 1.1, NONE

Moritz Heiber moe at lunar-linux.org
Mon Dec 27 16:42:29 UTC 2004 

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

Modified Files:
	BUILD CONFIGURE DETAILS POST_INSTALL 
Removed Files:
	BUILD.alpha 
Log Message:
Major rewrite of the linux-2.6 module

* Shamelessly stole most of the stuff from
  sofar's new linux-2.4 module ;^)
* Updated to 2.6.10. Tested with gcc 3.3.3, gcc 2.3.3,
  kernel-headers-2.6


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6/BUILD,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BUILD	19 Oct 2004 08:15:32 -0000	1.1
+++ BUILD	27 Dec 2004 16:41:49 -0000	1.2
@@ -1,56 +1,40 @@
-cd  $BUILD_DIRECTORY/linux
-
-while  
-    case  $CONFIG_KERNEL in
-	y|Y)
-	    case $CONFIG_METHOD in
-		xconfig )  
-		    if [ "$DISPLAY" ]; then
-	    		make xconfig || make menuconfig || make config
-	    	    else
-			make menuconfig || make config
-		    fi
-		    ;;
-
-		menuconfig )
-		    make menuconfig || make config ;;		
-		
-		config )
-		    make config ;;		
-	    esac
-
-	    if  query  "Repeat $CONFIG_METHOD?  "  n ; then  
-		CONFIG_KERNEL=y
-	    else  
-		CONFIG_KERNEL=n
-            fi
-	    
-	    ;;
+(
 
-	*)  
-	    false  ;;
-    esac
-do
+  while
+    if [ "$CONFIG_KERNEL" == "y" ]; then
+        if [ "$PREFER_XCONFIG" == "y" -a -n "$DISPLAY" ]; then
+	    make xconfig || make menuconfig || make config
+        elif [ "$PREFER_MENUCONFIG" == "y" ]; then
+	    make menuconfig || make config
+	else
+	    make config
+	fi
+        if ! query "Repeat configuration?" n; then
+            CONFIG_KERNEL=n
+        fi
+    else
+        false
+    fi
+  do
     true
-done
-
-
-(
-    yes  n  |  make  oldconfig
-    cp  .config  $CONFIG_CACHE/.config.2.6.stable
-    rm -f arch/i386/boot/bzImage
+  done
 
-   # Because parallel make seems not to work, a hack   
+) && (
 
-    optimize_make                      &&
-    KMAKES=${MAKES:=1}                 &&
-    make  -j${KMAKES} bzImage          &&
-    make  -j${KMAKES} modules          &&
-    backup_mods_krnl linux-${VERSION}  &&
-    prepare_install                    &&
-    make  modules_install
+  yes n | make oldconfig
+  LD_PRELOAD= cp .config $CONFIG_CACHE/.config.2.6.stable
+  rm -f arch/i386/boot/bzImage
 
-    cp arch/i386/boot/bzImage /boot/linux-${VERSION} 
-    cp System.map             /boot/System.map-${VERSION}
+  # Because parallel make seems not to work, a hack
 
+  optimize_make                                &&
+  KMAKES=${MAKES:=1}                           &&
+  make -j${KMAKES} bzImage                     &&
+  make -j${KMAKES} modules                     &&
+  backup_mods_krnl $VERSION	               &&
+  prepare_install                              &&
+  make modules_install                         &&
+  cp arch/i386/boot/bzImage /boot/$VERSION     &&
+  cp System.map /boot/System.map-$VERSION
+  
 ) > $C_FIFO 2>&1

Index: CONFIGURE
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6/CONFIGURE,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CONFIGURE	19 Oct 2004 08:15:32 -0000	1.1
+++ CONFIGURE	27 Dec 2004 16:41:50 -0000	1.2
@@ -1,60 +1,6 @@
-if  !  grep  -q  "BOOT_LOADER"  $MODULE_CONFIG;  then
-    #  message  "The Linux Kernel requires a boot loader"
-    message  "Choose either GRUB or LILO"
-    # BOOT_LOADER=lilo
-
-    if  query  "Use  LILO?"  y ; then  
-	BOOT_LOADER=lilo
-    else  
-	BOOT_LOADER=grub
-    fi
-
-    echo  "BOOT_LOADER=$BOOT_LOADER"  >>  $MODULE_CONFIG
-fi
-
-CONFIG_GRUB="n"
-CONFIG_LILO="n"
-
-if  grep  -q  "BOOT_LOADER=grub"  $MODULE_CONFIG  && query  "Configure grub?"  n ; then  
-    CONFIG_GRUB=y
-fi
-
-if  grep  -q  "BOOT_LOADER=lilo"  $MODULE_CONFIG  && query  "Configure lilo?"  n ; then  
-    CONFIG_LILO=y
-fi
-
-
-if  !  grep  -q  "CONFIG_METHOD="  $MODULE_CONFIG ; then
-    
-    if  query  "Do you prefer make menuconfig over make config"  y ; then  
-	CONFIG_METHOD="menuconfig"
-    else  
-	CONFIG_METHOD="config"
-    fi
-    
-    echo  "CONFIG_METHOD=$CONFIG_METHOD"  >>  $MODULE_CONFIG
-fi
-
-
-
-if  [  !  -f  $CONFIG_CACHE/.config.beta  ] && [ ! -f $CONFIG_CACHE/.config ]; then
-    message  "Preparing to make menuconfig."
-    CONFIG_KERNEL="y"
-else
-    message  "Reconfiguration is optional."
-    
-    if  query  "Configure linux kernel?"  n ; then  
-	CONFIG_KERNEL=y
-    else  
-	CONFIG_KERNEL=n
-    fi
-fi
-
-TEMP=`grep  -v  "CONFIG_KERNEL=" $MODULE_CONFIG  |
-      grep  -v  "CONFIG_LILO="                   |
-      grep  -v  "CONFIG_GRUB="`
-
-echo  "$TEMP"                         >   $MODULE_CONFIG
-echo  "CONFIG_KERNEL=$CONFIG_KERNEL"  >>  $MODULE_CONFIG
-echo  "CONFIG_LILO=$CONFIG_LILO"      >>  $MODULE_CONFIG
-echo  "CONFIG_GRUB=$CONFIG_GRUB"      >>  $MODULE_CONFIG
+mquery USE_GRUB "Configure this kernel to load from grub?" n
+mquery USE_LILO "Configure this kernel to load from lilo?" n
+mquery PREFER_XCONFIG "Do you prefer xconfig over menuconfig?" n
+mquery PREFER_MENUCONFIG "Do you prefer menuconfig over config?" y
+unset_module_config CONFIG_KERNEL
+mquery CONFIG_KERNEL "Configure linux kernel?" n

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6/DETAILS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DETAILS	19 Oct 2004 08:15:32 -0000	1.1
+++ DETAILS	27 Dec 2004 16:41:50 -0000	1.2
@@ -1,12 +1,12 @@
           MODULE=linux-2.6
-         VERSION=2.6.9
+         VERSION=2.6.10
           SOURCE=linux-${VERSION}.tar.bz2
    SOURCE_URL[0]=$KERNEL_URL/pub/linux/kernel/v2.6/
    SOURCE_URL[1]=http://www.kernel.org/pub/linux/kernel/v2.6/
-      SOURCE_VFY=sha1:dd8f8b0c43b83339a42246d322cb48c6f2323236
+      SOURCE_VFY=sha1:3c83791c20f9a397b287825a9a5984010a07e711
 	WEB_SITE=http://www.kernel.org
          ENTERED=20041019
-         UPDATED=20041019
+         UPDATED=20041227
            SHORT="The Linux kernel is the core of a Linux GNU Operating System."
 cat << EOF
 This is the stable version of the 2.6.x branch.

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6/POST_INSTALL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- POST_INSTALL	19 Oct 2004 08:15:32 -0000	1.1
+++ POST_INSTALL	27 Dec 2004 16:41:50 -0000	1.2
@@ -1,12 +1,10 @@
-# Done to shorten the boot label for lilo
-LABEL=`echo ${VERSION} | sed 's/-//g'`
-
-case  $BOOT_LOADER  in
-  lilo)  update_lilo   linux-${VERSION}  ${LABEL} ;;
-  grub)  update_grub   linux-${VERSION}  ${LABEL} ;;
-  aboot)  update_aboot   linux-${VERSION}  ${LABEL} ;;
-esac
-
+if [ "$USE_LILO" == "y" ]; then
+    update_lilo $VERSION $VERSION
+else
+  if [ "$USE_GRUB" == "y" ]; then
+    update_grub $VERSION $VERSION
+  fi
+fi
 
 #  Reinstall packages that add their own kernel modules
 

--- BUILD.alpha DELETED ---

More information about the Lunar-commits mailing list