[Lunar-commits] CVS: moonbase/kernel/linux-2.6-mm BUILD, 1.2, 1.3 CONFIGURE, 1.1, 1.2 DETAILS, 1.8, 1.9 POST_INSTALL, 1.1, 1.2 PRE_BUILD, 1.3, 1.4

Jaime Buffery nestu at lunar-linux.org
Fri Jan 7 23:33:49 UTC 2005 

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

Modified Files:
	BUILD CONFIGURE DETAILS POST_INSTALL PRE_BUILD 
Log Message:
Version bump: 2.6.10rc3mm1 -> 2.6.10mm2. gcc 3.3.3, glibc 2.3.2, headers 2.6.9.1
Some cosmetic fixes too.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6-mm/BUILD,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BUILD	26 Oct 2004 15:41:11 -0000	1.2
+++ BUILD	7 Jan 2005 23:33:44 -0000	1.3
@@ -1,56 +1,41 @@
-cd  /usr/src/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
-    true
+cd /usr/src/linux/
+    
+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-mm
+    
+    cp  /usr/src/linux/.config  $CONFIG_CACHE/.config-2.6-mm
     rm -f arch/i386/boot/bzImage
-
+    
    # 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 #        &&
+    make  modules_install          &&
 
-    cp arch/i386/boot/bzImage /boot/${VERSION} 
-    cp System.map             /boot/System.map-${VERSION}	
+    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-mm/CONFIGURE,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CONFIGURE	13 Oct 2004 18:09:32 -0000	1.1
+++ CONFIGURE	7 Jan 2005 23:33:44 -0000	1.2
@@ -1,60 +1,25 @@
-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
+mquery USE_GRUB "Configure this kernel to load from grub?" n
 
+if [ "`get_module_config USE_GRUB`" = "y" ]; then 
+    set_module_config "USE_LILO" "n" ; 
 
-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
+    mquery CONFIG_GRUB "Configure grub?" n
+else 
+    mquery USE_LILO "Configure this kernel to load from lilo?" n
     
-    echo  "CONFIG_METHOD=$CONFIG_METHOD"  >>  $MODULE_CONFIG
+    if [ "`get_module_config USE_LILO`" = "y" ]; then
+	mquery CONFIG_LILO "Configure lilo?" n    
+    fi     		  
 fi
 
+mquery PREFER_XCONFIG "Do you prefer xconfig over menuconfig?" n
 
-
-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
+if [ "`get_module_config PREFER_XCONFIG`" = "y" ]; then
+    set_module_config "PREFER_MENUCONFIG" "n" ; 
+else 
+    mquery PREFER_MENUCONFIG "Do you prefer menuconfig over config?" y
 fi
 
-TEMP=`grep  -v  "CONFIG_KERNEL=" $MODULE_CONFIG  |
-      grep  -v  "CONFIG_LILO="                   |
-      grep  -v  "CONFIG_GRUB="`
+unset_module_config CONFIG_KERNEL
+mquery CONFIG_KERNEL "Configure linux kernel?" n
 
-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

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6-mm/DETAILS,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- DETAILS	13 Dec 2004 22:04:17 -0000	1.8
+++ DETAILS	7 Jan 2005 23:33:45 -0000	1.9
@@ -1,21 +1,17 @@
           MODULE=linux-2.6-mm
-  KERNEL_VERSION=2.6.9
-      RC_VERSION=2.6.10-rc3
-      MM_VERSION=mm1
-         VERSION=${RC_VERSION}-${MM_VERSION}
+  KERNEL_VERSION=2.6.10
+      MM_VERSION=mm2
+         VERSION=${KERNEL_VERSION}-${MM_VERSION}
           SOURCE=linux-${KERNEL_VERSION}.tar.bz2
-         SOURCE2=patch-${RC_VERSION}.bz2
-         SOURCE3=${VERSION}.bz2 
+         SOURCE2=${VERSION}.bz2
    SOURCE_URL[0]=${KERNEL_URL}/pub/linux/kernel/v2.6/
    SOURCE_URL[1]=http://www.kernel.org/pub/linux/kernel/v2.6/
-     SOURCE2_URL=ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/
-     SOURCE3_URL=ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/${RC_VERSION}/${VERSION}/
-      SOURCE_VFY=sha1:dd8f8b0c43b83339a42246d322cb48c6f2323236
-     SOURCE2_VFY=sha1:e0ef1eae1a9fc5c002e9e4118389e0e0778ff2fe
-     SOURCE3_VFY=sha1:88c8274182c0709f658aa2f725b0c732b05641f5
+     SOURCE2_URL=ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/${KERNEL_VERSION}/${VERSION}/
+      SOURCE_VFY=sha1:3c83791c20f9a397b287825a9a5984010a07e711
+     SOURCE2_VFY=sha1:e46e7740ef67dc65da5df51a7ecf38e879a222a5
         WEB_SITE=http://www.kernel.org
          ENTERED=20041013
-         UPDATED=20041213
+         UPDATED=20050107
            SHORT="2.6 kernel with Andrew Morton's latest test patches."
 cat << EOF
 The -mm patches are a set of patches, released by Andrew Morton, against the 

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6-mm/POST_INSTALL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- POST_INSTALL	13 Oct 2004 18:09:32 -0000	1.1
+++ POST_INSTALL	7 Jan 2005 23:33:45 -0000	1.2
@@ -1,22 +1,12 @@
 # Done to shorten the boot label for lilo
 LABEL=`echo ${VERSION} | sed 's/-//g'`
 
-case  $BOOT_LOADER  in
-  lilo)  update_lilo   ${VERSION}  ${LABEL} ;;
-  grub)  update_grub   ${VERSION}  ${LABEL} ;;
-esac
-
+if [ "$USE_LILO" == "y" ]; then
+    update_lilo ${VERSION}  ${LABEL}
+elif [ "$USE_GRUB" == "y" ]; then
+    update_grub ${VERSION}  ${LABEL}
+fi
 
 #  Reinstall packages that add their own kernel modules
+lin -c kernel-reqs
 
-if  module_installed  ftpfs;          then  lin  ftpfs;          fi
-if  module_installed  cvsfs;          then  lin  cvsfs;          fi
-if  module_installed  NVIDIA;       then  lin  NVIDIA;       fi
-if  module_installed  cryptoapi;      then  lin  cryptoapi;      fi
-if  module_installed  pcmcia-cs;      then  lin -r -c pcmcia-cs; fi
-if  module_installed  mwavem;         then  lin  mwavem;         fi
-if  module_installed  cipe;           then  lin  cipe;           fi
-if  module_installed  snare-core;     then  lin  snare-core;     fi
-if  module_installed  bluez-kernel;   then  lin  bluez-kernel;   fi
-if  module_installed  submount;       then  lin  submount;       fi
-if  module_installed  hostap-driver;  then  lin  hostap-driver;  fi

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6-mm/PRE_BUILD,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PRE_BUILD	6 Nov 2004 11:15:08 -0000	1.3
+++ PRE_BUILD	7 Jan 2005 23:33:45 -0000	1.4
@@ -14,24 +14,23 @@
     mv linux-${KERNEL_VERSION} linux-${VERSION}
     
     ln -sf linux-${VERSION}  linux
-       
+    
     chown root.root linux
     
     cd linux
     
     patch_it $SOURCE2 1
-    patch_it $SOURCE3 1
 
-    for config in .config-2.6-mm .config.2.6.stable .config.beta
-      do
-      if [  -f  $CONFIG_CACHE/${config} ]; then 
+    for config in .config-2.6-mm .config.2.6.stable
+      do	
+      if [ -f  $CONFIG_CACHE/${config} ]; then 
 	  cp  $CONFIG_CACHE/${config}  /usr/src/linux/.config
 	  message "Importing ${config} as kernel default configuration"
       else	
 	  break
       fi
     done
-
+    
 else
 
     message "Sources found: /usr/src/linux-${VERSION}"
@@ -42,3 +41,4 @@
     fi
 
 fi
+

More information about the Lunar-commits mailing list