[Lunar-commits] <moonbase> linux-2.6-stable: oops, restore the good old files back.

[Florin Braescu]

commit e148edaf096661d1487fb58bda1a4a1f350d028d
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Mon Jan 9 04:40:45 2012 +0100

    linux-2.6-stable: oops, restore the good old files back.
---
 kernel/linux-2.6-stable/BUILD        |   39 ++++++++++++++++++++++++---------
 kernel/linux-2.6-stable/POST_INSTALL |    5 +---
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/kernel/linux-2.6-stable/BUILD b/kernel/linux-2.6-stable/BUILD
index c8e04ec..5ce3f41 100644
--- a/kernel/linux-2.6-stable/BUILD
+++ b/kernel/linux-2.6-stable/BUILD
@@ -1,21 +1,38 @@
 (
+   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`"
+) && (
 
-  PATCH_VERSION=$(echo $VERSION | cut -d . -f 3)
-  FULL_VERSION=$(echo $VERSION | cut -d . -f 1,2).${PATCH_VERSION:-0}
+  # 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 $FULL_VERSION
-  prepare_install
-  make modules_install
-  cp arch/${MYARCH}/boot/bzImage /boot/$FULL_VERSION-`arch`
-  cp System.map /boot/System.map-$FULL_VERSION-`arch`
+  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`
 
 ) > $C_FIFO 2>&1
diff --git a/kernel/linux-2.6-stable/POST_INSTALL b/kernel/linux-2.6-stable/POST_INSTALL
index 700bc17..dd6cddc 100644
--- a/kernel/linux-2.6-stable/POST_INSTALL
+++ b/kernel/linux-2.6-stable/POST_INSTALL
@@ -1,7 +1,4 @@
-PATCH_VERSION=$(echo $VERSION | cut -d . -f 3)
-FULL_VERSION=$(echo $VERSION | cut -d . -f 1,2).${PATCH_VERSION:-0}
-
-update_bootloader $FULL_VERSION-`arch` $VERSION-`arch`
+update_bootloader $VERSION-`arch` $VERSION-`arch`
 
 #  Reinstall packages that add their own kernel modules