[Lunar-commits] <moonbase> linux-2.6: Push configure stuff out to PRE_BUILD

[Auke Kok]

commit f924fe828ecb91bacb873da107584fb85de0d109
Author: Auke Kok <sofar at foo-projects.org>
Date:   Thu Jun 16 05:59:21 2011 +0200

    linux-2.6: Push configure stuff out to PRE_BUILD
    
    PRE_BUILD is safe from IO redirection, so anything that's interactive
    will need to use PRE_BUILD instead of BUILD, and this is mostly the
    kernel. Someone will have to change the other kernels in the same way.
---
 kernel/linux-2.6/BUILD     |   53 +++++++++++--------------------------------
 kernel/linux-2.6/PRE_BUILD |   20 ++++++++++++++++
 2 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/kernel/linux-2.6/BUILD b/kernel/linux-2.6/BUILD
index a20e8d3..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`"
-
-  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`
-
-) > $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/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
+