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

Jaime Buffery nestu at lunar-linux.org
Fri Jan 7 21:26:47 UTC 2005 

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

Modified Files:
	BUILD CONFIGURE DETAILS POST_INSTALL PRE_BUILD 
Log Message:
2.6.7-2.0.1 -> 2.6.10-2.1.0 gcc 3.3.3, glibc 2.3.2, headers 2.6.9.1
Some cosmetics done too, to be like the rest of the linux-2.6* family


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6-grsec/BUILD,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BUILD	12 Oct 2004 15:16:45 -0000	1.1
+++ BUILD	7 Jan 2005 21:26:45 -0000	1.2
@@ -1,59 +1,41 @@
-cd  /usr/src/linux
+(
+    cd /usr/src/linux/
 
-while  
-case  $CONFIG_KERNEL in
-    y|Y)
-    case $CONFIG_METHOD in		
-	xconfig )  
-	
-	if [ "$DISPLAY" ]; then
+    while
+    if [ "$CONFIG_KERNEL" == "y" ]; then
+        if [ "$PREFER_XCONFIG" == "y" -a -n "$DISPLAY" ]; then
 	    make xconfig || make menuconfig || make config
-	else
+        elif [ "$PREFER_MENUCONFIG" == "y" ]; then
 	    make menuconfig || make config
+	else
+	    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
+        if ! query "Repeat configuration?" n; then
+            CONFIG_KERNEL=n
+        fi
+    else
+        false
     fi
+      do
+      true
+    done
     
-    ;;
+) && (
     
-    *)  
-    false  
-    ;;
-esac
-  do
-  true
-done
-
-(
-    yes  n  |  make  oldconfig
-    cp  .config  $CONFIG_CACHE/.config-2.6-grsec
+    yes n | make oldconfig
+    LD_PRELOAD= cp .config $CONFIG_CACHE/.config-2.6-grsec
     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 ${KERNEL_VERSION}-grsec-${GRSEC_VERSION}   &&
-    prepare_install                    				&&
-    make  modules_install              				&&
+  # Because parallel make seems not to work, a hack
     
-    cp arch/i386/boot/bzImage /boot/${KERNEL_VERSION}-grsec-${GRSEC_VERSION} 			&&
-    cp System.map             /boot/System.map-${KERNEL_VERSION}-grsec-${GRSEC_VERSION}
+    optimize_make									&&
+    KMAKES=${MAKES:=1}								&&
+    make -j${KMAKES} bzImage							&&
+    make -j${KMAKES} modules							&&
+    backup_mods_krnl ${KERNEL_VERSION}-grsec-${GRSEC_VERSION}			&&
+    prepare_install								&&
+    make modules_install								&&
+    cp arch/i386/boot/bzImage /boot/${KERNEL_VERSION}-grsec-${GRSEC_VERSION}     	&&
+    cp System.map /boot/System.map-${KERNEL_VERSION}-grsec-${GRSEC_VERSION}
     
 ) > $C_FIFO 2>&1

Index: CONFIGURE
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6-grsec/CONFIGURE,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CONFIGURE	12 Oct 2004 15:16:45 -0000	1.1
+++ CONFIGURE	7 Jan 2005 21:26:45 -0000	1.2
@@ -1,56 +1,19 @@
-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
+mquery USE_GRUB "Configure this kernel to load from grub?" n
 
-if  grep  -q  "BOOT_LOADER=lilo"  $MODULE_CONFIG  && query  "Configure lilo?"  n ; then  
-    CONFIG_LILO=y
+if [ "`get_module_config USE_GRUB`" = "y" ]; then 
+    set_module_config "USE_LILO" "n" ; 
+else 
+    mquery USE_LILO "Configure this kernel to load from lilo?" n
 fi
 
+mquery PREFER_XCONFIG "Do you prefer xconfig over menuconfig?" 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
-    
-    echo  "CONFIG_METHOD=$CONFIG_METHOD"  >>  $MODULE_CONFIG
-fi
-
-if [ ! -f $CONFIG_CACHE/.config-2.6-grsec ]; 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-grsec/DETAILS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DETAILS	12 Oct 2004 15:16:45 -0000	1.1
+++ DETAILS	7 Jan 2005 21:26:45 -0000	1.2
@@ -1,18 +1,21 @@
           MODULE=linux-2.6-grsec
-  KERNEL_VERSION=2.6.7
-   GRSEC_VERSION=2.0.1
+  KERNEL_VERSION=2.6.10
+   GRSEC_VERSION=2.1.0
          VERSION=${KERNEL_VERSION}-${GRSEC_VERSION}	  
           SOURCE=linux-${KERNEL_VERSION}.tar.bz2
-         SOURCE2=grsecurity-${GRSEC_VERSION}-${KERNEL_VERSION}.patch
+         SOURCE2=grsecurity-${GRSEC_VERSION}-${KERNEL_VERSION}-200501071049.patch
+         SOURCE3=linux-2.6.10-secfix-200501071130.patch
 SOURCE_DIRECTORY=linux-${KERNEL_VERSION}-grsec-${GRSEC_VERSION} 
    SOURCE_URL[0]=$KERNEL_URL/pub/linux/kernel/v2.6/
    SOURCE_URL[1]=http://www.kernel.org/pub/linux/kernel/v2.6/
      SOURCE2_URL=http://www.grsecurity.org/
-      SOURCE_VFY=sha1:a030a9c6dcd10c5d90a86f915ad4710084cbca71
-     SOURCE2_VFY=sha1:caa94787653362783849a4424d3e24430acf29ab
+     SOURCE3_URL=http://www.grsecurity.org/
+      SOURCE_VFY=sha1:3c83791c20f9a397b287825a9a5984010a07e711
+     SOURCE2_VFY=sha1:754182d24b9e11facbdaf3b95b81701c0454f1cb
+     SOURCE3_VFY=sha1:3af49efed94c2c982f9da2400201d3f59b9ae4ca
     	WEB_SITE=http://www.kernel.org
          ENTERED=20041012
-         UPDATED=20041012
+         UPDATED=20050107
      KEEP_SOURCE="on"
            SHORT="The Linux kernel with the latest grsecurity patch"
 cat << EOF

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6-grsec/POST_INSTALL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- POST_INSTALL	12 Oct 2004 15:16:45 -0000	1.1
+++ POST_INSTALL	7 Jan 2005 21:26:45 -0000	1.2
@@ -1,23 +1,8 @@
-# Done to shorten the boot label for lilo
-#LABEL=`echo ${VERSION} | sed 's/-//g' | sed 's/test/t/g'`
-
-case  $BOOT_LOADER  in
-  lilo)  update_lilo   ${KERNEL_VERSION}-grsec-${GRSEC_VERSION}  ${KERNEL_VERSION}-grsec-${GRSEC_VERSION} ;;
-  grub)  update_grub   ${KERNEL_VERSION}-grsec-${GRSEC_VERSION}  ${KERNEL_VERSION}-grsec-${GRSEC_VERSION} ;;
-  aboot) update_aboot  ${KERNEL_VERSION}-grsec-${GRSEC_VERSION}  ${KERNEL_VERSION}-grsec-${GRSEC_VERSION} ;;
-esac
-
+if [ "$USE_LILO" == "y" ]; then
+    update_lilo ${KERNEL_VERSION}-grsec-${GRSEC_VERSION}  ${KERNEL_VERSION}-grsec-${GRSEC_VERSION}
+elif [ "$USE_GRUB" == "y" ]; then
+    update_grub ${KERNEL_VERSION}-grsec-${GRSEC_VERSION}  ${KERNEL_VERSION}-grsec-${GRSEC_VERSION}
+fi
 
 #  Reinstall packages that add their own kernel modules
-
-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  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
+lin -c kernel-reqs

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6-grsec/PRE_BUILD,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PRE_BUILD	12 Oct 2004 15:19:18 -0000	1.2
+++ PRE_BUILD	7 Jan 2005 21:26:45 -0000	1.3
@@ -10,29 +10,30 @@
     unpack  $SOURCE 
     
     # let's make our source dir have a unique name
-
+    
     mv linux-${KERNEL_VERSION} ${SOURCE_DIR_NAME} &&    
     ln  -s   ${SOURCE_DIR_NAME}  linux             &&
     
     cd  linux/ &&
-
+    
     patch_it  ${SOURCE2}  1 &&
+    patch_it  ${SOURCE3}  1 &&
     
-    for config in .config-2.6-grsec .config.beta 
-    do
+    for config in .config-2.6-grsec .config.2.6.stable
+      do
       if [ -f ${CONFIG_CACHE}/${config} ]; then
-    	  cp $CONFIG_CACHE/${config} /usr/src/linux/.config 
-	  break
+	  cp $CONFIG_CACHE/${config} /usr/src/linux/.config 
+	  break	
       fi	
     done
     
 else
-    
+
     message "Sources found: /usr/src/${SOURCE_DIR_NAME}" 
     
     if [ "`readlink linux`" != "${SOURCE_DIR_NAME}" ]; then
-		rm -rf linux
-		ln -s ${SOURCE_DIR_NAME} linux
+	rm -rf linux
+	ln -s ${SOURCE_DIR_NAME} linux
     fi
     
 fi

More information about the Lunar-commits mailing list