[Lunar-commits] <moonbase> linux-stable: fix the build using cavalier's patch.

[Florin Braescu]

commit a9862d0a41fef031a84efb660301d7f66a293474
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Sun Jan 8 18:43:58 2012 +0100

    linux-stable: fix the build using cavalier's patch.
---
 kernel/linux-2.6-stable/BUILD        |   41 ++++++++++------------------------
 kernel/linux-2.6-stable/POST_INSTALL |    5 +++-
 2 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/kernel/linux-2.6-stable/BUILD b/kernel/linux-2.6-stable/BUILD
index 5ce3f41..c9d632c 100644
--- a/kernel/linux-2.6-stable/BUILD
+++ b/kernel/linux-2.6-stable/BUILD
@@ -1,38 +1,21 @@
 (
-   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
+# 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}
+
   echo | make oldconfig
-  LD_PRELOAD= cp .config $CONFIG_CACHE/.config.2.6.stable
+  LD_PRELOAD= cp .config $CONFIG_CACHE/.config.current
   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`
+  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`
 
 ) > $C_FIFO 2>&1
diff --git a/kernel/linux-2.6-stable/POST_INSTALL b/kernel/linux-2.6-stable/POST_INSTALL
index dd6cddc..700bc17 100644
--- a/kernel/linux-2.6-stable/POST_INSTALL
+++ b/kernel/linux-2.6-stable/POST_INSTALL
@@ -1,4 +1,7 @@
-update_bootloader $VERSION-`arch` $VERSION-`arch`
+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`
 
 #  Reinstall packages that add their own kernel modules