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

Nick Hudson nhudson at lunar-linux.org
Tue Mar 29 21:52:49 UTC 2005


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

Modified Files:
	BUILD CONFIGURE DEPENDS DETAILS POST_INSTALL PRE_BUILD 
Log Message:

Updating 2.6 inotify kernel to latest version 0.21 with 2.6.11 kernel.  


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6-inotify/BUILD,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BUILD	27 Oct 2004 22:52:48 -0000	1.1
+++ BUILD	29 Mar 2005 21:52:46 -0000	1.2
@@ -1,39 +1,24 @@
 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
-
+  done
 
 (
     yes  n  |  make  oldconfig
@@ -50,7 +35,7 @@
     prepare_install                    &&
     make  modules_install
 
-    cp arch/i386/boot/bzImage /boot/linux-${VERSION}-inotify 
-    cp System.map             /boot/System.map-${VERSION}-inotify
+    cp arch/i386/boot/bzImage /boot/linux-${VERSION}
+    cp System.map             /boot/System.map-${VERSION}
 
 ) > $C_FIFO 2>&1

Index: CONFIGURE
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6-inotify/CONFIGURE,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CONFIGURE	27 Oct 2004 22:52:48 -0000	1.1
+++ CONFIGURE	29 Mar 2005 21:52:46 -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
+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
-fi
+if [ "`get_module_config USE_GRUB`" = "y" ]; then
+    set_module_config "USE_LILO" "n" ;
 
+    mquery CONFIG_GRUB "Configure grub?" n
+else
+    mquery USE_LILO "Configure this kernel to load from 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"
+    if [ "`get_module_config USE_LILO`" = "y" ]; then
+        mquery CONFIG_LILO "Configure lilo?" n
     fi
-    
-    echo  "CONFIG_METHOD=$CONFIG_METHOD"  >>  $MODULE_CONFIG
 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"
+if [ "`get_module_config PREFER_XCONFIG`" = "y" ]; then
+    set_module_config "PREFER_MENUCONFIG" "n" ;
 else
-    message  "Reconfiguration is optional."
-    
-    if  query  "Configure linux kernel?"  n ; then  
-	CONFIG_KERNEL=y
-    else  
-	CONFIG_KERNEL=n
-    fi
+    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: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6-inotify/DEPENDS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DEPENDS	27 Oct 2004 22:52:48 -0000	1.1
+++ DEPENDS	29 Mar 2005 21:52:46 -0000	1.2
@@ -1,2 +1 @@
-depends  autoconf &&
 depends  module-init-tools

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6-inotify/DETAILS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DETAILS	27 Oct 2004 22:52:48 -0000	1.1
+++ DETAILS	29 Mar 2005 21:52:46 -0000	1.2
@@ -1,16 +1,18 @@
           MODULE=linux-2.6-inotify
-         VERSION=2.6.9
-          SOURCE=linux-${VERSION}.tar.bz2
-         SOURCE2=inotify-0.14-rml-${VERSION}-1.patch
+  KERNEL_VERSION=2.6.11
+ INOTIFY_VERSION=0.21
+         VERSION=${KERNEL_VERSION}-inotify
+          SOURCE=linux-${KERNEL_VERSION}.tar.bz2
+         SOURCE2=inotify-${INOTIFY_VERSION}-rml-${KERNEL_VERSION}-2.patch
    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.kernel.org/pub/linux/kernel/people/rml/inotify/v2.6/0.14/
-      SOURCE_VFY=sha1:dd8f8b0c43b83339a42246d322cb48c6f2323236
-     SOURCE2_VFY=sha1:ccf5ae8ebb347d9ce2f412268dd81823e134de48
+     SOURCE2_URL=http://www.kernel.org/pub/linux/kernel/people/rml/inotify/v2.6/${INOTIFY_VERSION}/
+      SOURCE_VFY=sha1:d72ab76360d004dac4b976633dd0490e8d4b15cd
+     SOURCE2_VFY=sha1:2b6c4dcf311299684fa0eecb448bad4817df3d7f
 	WEB_SITE=http://www.kernel.org
          ENTERED=20041026
-         UPDATED=20041026
-           SHORT="The Linux kernel with the latest inotify patch, needed specially by Gnome 2.8+ users."
+         UPDATED=20050329
+           SHORT="2.6 Kernel with Robert Love's Inotify Patch"
 cat << EOF
 ${SHORT}
 EOF

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6-inotify/POST_INSTALL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- POST_INSTALL	27 Oct 2004 22:52:48 -0000	1.1
+++ POST_INSTALL	29 Mar 2005 21:52:46 -0000	1.2
@@ -1,13 +1,11 @@
 # Done to shorten the boot label for lilo
 LABEL=`echo ${VERSION} | sed 's/-//g'`
 
-case  $BOOT_LOADER  in
-  lilo)  update_lilo   linux-${VERSION}  ${LABEL}-inotify ;;
-  grub)  update_grub   linux-${VERSION}  ${LABEL}-inotify ;;
-  aboot)  update_aboot   linux-${VERSION}  ${LABEL}-inotify ;;
-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

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/kernel/linux-2.6-inotify/PRE_BUILD,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PRE_BUILD	27 Oct 2004 22:52:48 -0000	1.1
+++ PRE_BUILD	29 Mar 2005 21:52:46 -0000	1.2
@@ -2,7 +2,7 @@
 
 if [ ! -d /usr/src/linux-${VERSION} ]; then
     
-    rm  -rf  linux-${VERSION}-inotify # we remove this one just in case
+    rm  -rf  linux-${KERNEL_VERSION} # we remove this one just in case
     rm  -rf  linux-${VERSION}
     rm  -rf  linux
 
@@ -11,32 +11,34 @@
     # 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-${VERSION} linux-${VERSION}-inotify
+    mv linux-${KERNEL_VERSION} linux-${VERSION}
 
-    ln  -sf     linux-${VERSION}-inotify  linux
+    ln  -sf     linux-${VERSION}  linux
     
     chown root.root /usr/src/linux
-    chown root.root /usr/src/linux-${VERSION}-inotify
+    chown root.root /usr/src/linux-${VERSION}
  
     patch_it $SOURCE2 0 
     
     cd linux
-
-	for config in .config-2.6.inotify .config.2.6.stable
-	do
-		test -f ${CONFIG_CACHE}/${config} || continue
-		message "using ${config} as default configuration
-		cp ${CONFIG_CACHE}/${config} /usr/src/linux/.config
-		break
-	done
+   
+     for config in .config-2.6-inotify .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}-inotify"
+    message "Sources found: /usr/src/linux-${VERSION}"
     
-    if [ "`readlink linux`" != "linux-${VERSION}-inotify" ]; then
+    if [ "`readlink linux`" != "linux-${VERSION}" ]; then
 		rm -rf linux	
-		ln -s linux-${VERSION}-inotify linux
+		ln -s linux-${VERSION} linux
     fi
 
 fi



More information about the Lunar-commits mailing list