[Lunar-commits] <crater> linux-2.6: move it from moonbase/zdeprecated.

[Florin Braescu]

commit 2876c159741715b72cbf528a5aaee4f8e854eae9
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Wed Jan 11 18:12:47 2012 +0100

    linux-2.6: move it from moonbase/zdeprecated.
---
 kernel/linux-2.6/BUILD        |   53 +++++++++++------------------------------
 kernel/linux-2.6/CONFIGURE    |    2 +-
 kernel/linux-2.6/DETAILS      |   21 +++++++---------
 kernel/linux-2.6/POST_INSTALL |    2 +-
 kernel/linux-2.6/PRE_BUILD    |   20 +++++++++++++++
 5 files changed, 45 insertions(+), 53 deletions(-)

diff --git a/kernel/linux-2.6/BUILD b/kernel/linux-2.6/BUILD
index 1c63335..6e27287 100644
--- a/kernel/linux-2.6/BUILD
+++ b/kernel/linux-2.6/BUILD
@@ -1,39 +1,14 @@
-(
-
-  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
-
-) && (
-
-  # Needed for x86_64
-  MYARCH="`arch | grep -qw i.86 && echo i386 || arch`"
-
-  yes n | make oldconfig
-  LD_PRELOAD= cp .config $CONFIG_CACHE/.config.2.6.stable
-  rm -f arch/${MYARCH}/boot/bzImage
-
-  make ${MAKES:+-j$MAKES} bzImage           &&
-  make ${MAKES:+-j$MAKES} modules           &&
-  backup_mods_krnl $VERSION                    &&
-  prepare_install                           &&
-  make modules_install                      &&
-  cp arch/${MYARCH}/boot/bzImage /boot/$VERSION  &&
-  cp System.map /boot/System.map-$VERSION
-  
-) > $C_FIFO 2>&1
+# Needed for x86_64
+MYARCH="`arch | grep -qw i.86 && echo i386 || arch`"
+
+echo | make oldconfig
+LD_PRELOAD= cp .config $CONFIG_CACHE/.config.2.6.stable
+rm -f arch/${MYARCH}/boot/bzImage
+
+make ${MAKES:+-j$MAKES} bzImage
+make ${MAKES:+-j$MAKES} modules
+backup_mods_krnl $VERSION
+prepare_install
+make modules_install
+cp arch/${MYARCH}/boot/bzImage /boot/$VERSION-`arch`
+cp System.map /boot/System.map-$VERSION-`arch`
diff --git a/kernel/linux-2.6/CONFIGURE b/kernel/linux-2.6/CONFIGURE
index 8fa5719..d4f4842 100644
--- a/kernel/linux-2.6/CONFIGURE
+++ b/kernel/linux-2.6/CONFIGURE
@@ -2,7 +2,7 @@ mquery PREFER_XCONFIG "Do you prefer xconfig over menuconfig?" n
 
 if [ "`get_module_config PREFER_XCONFIG`" = "y" ]; then
     set_module_config "PREFER_MENUCONFIG" "n" ; 
-else 
+else
     mquery PREFER_MENUCONFIG "Do you prefer menuconfig over config?" y
 fi
 
diff --git a/kernel/linux-2.6/DETAILS b/kernel/linux-2.6/DETAILS
index 82823ed..af9cc22 100644
--- a/kernel/linux-2.6/DETAILS
+++ b/kernel/linux-2.6/DETAILS
@@ -1,24 +1,21 @@
           MODULE=linux-2.6
-         VERSION=2.6.24
-            BASE=$(echo $VERSION | cut -d. -f1,2,3)
-          SOURCE=linux-${BASE}.tar.bz2
-#         SOURCE2=patch-${VERSION}.bz2
+         VERSION=2.6.39.4
+          SOURCE=linux-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/linux-$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[0]=$KERNEL_URL/pub/linux/kernel/v2.6/
-#  SOURCE2_URL[1]=http://www.kernel.org/pub/linux/kernel/v2.6/
-      SOURCE_VFY=sha1:351aebc784a5395fe4c92d1e514a89680482f7e2
-#     SOURCE2_VFY=sha1:a4eba6eaece54a7dc85c12443fb0d875dad66355
+   SOURCE_URL[0]=$KERNEL_URL/pub/linux/kernel/v2.6
+   SOURCE_URL[1]=http://www.kernel.org/pub/linux/kernel/v2.6
+  SOURCE2_URL[0]=$KERNEL_URL/pub/linux/kernel/v2.6
+  SOURCE2_URL[1]=http://www.kernel.org/pub/linux/kernel/v2.6
+      SOURCE_VFY=sha1:b9262c836a02de3d3a6abb5ccb780816d52b5277
         WEB_SITE=http://www.kernel.org
          ENTERED=20041019
-         UPDATED=20080130
+         UPDATED=20110806
            SHORT="The core of a Linux GNU Operating System"
      KEEP_SOURCE=on
            TMPFS=off
 
 cat << EOF
-This is the stable version of the 2.6.x branch.
+This is the latest version of the 2.6.x branch.
 
 Linux is a clone of the Unix kernel, written from scratch by Linus
 Torvalds with assistance from a loosely-knit team of hackers across the
diff --git a/kernel/linux-2.6/POST_INSTALL b/kernel/linux-2.6/POST_INSTALL
index 1963779..dd6cddc 100644
--- a/kernel/linux-2.6/POST_INSTALL
+++ b/kernel/linux-2.6/POST_INSTALL
@@ -1,4 +1,4 @@
-update_bootloader $VERSION $VERSION
+update_bootloader $VERSION-`arch` $VERSION-`arch`
 
 #  Reinstall packages that add their own kernel modules
 
diff --git a/kernel/linux-2.6/PRE_BUILD b/kernel/linux-2.6/PRE_BUILD
index 23715b2..65d4896 100644
--- a/kernel/linux-2.6/PRE_BUILD
+++ b/kernel/linux-2.6/PRE_BUILD
@@ -30,3 +30,23 @@ if  [ -f $CONFIG_CACHE/.config.2.6.stable ]; then
 elif [ -f $CONFIG_CACHE/.config.beta ]; then
     cp $CONFIG_CACHE/.config.beta $SOURCE_DIRECTORY/.config;
 fi
+
+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
+