[oe-commits] Thomas Kunze : fix configuration of older kernels

[GIT User account]

Module: openembedded.git
Branch: hrw/poky-merge/add-rpm-packages-support
Commit: 29839e2c84c15d64f0c422cf504da2ac2f943393
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=29839e2c84c15d64f0c422cf504da2ac2f943393

Author: Thomas Kunze <thommycheck at gmx.de>
Date:   Fri Mar  6 00:22:58 2009 +0100

fix configuration of older kernels

Was broken from commit b697819f7e84e19ca2adc9846421c8c8137b8fca
for  kernels that have no scripts/Makefile.fwinst (<=2.6.26 or so)

---

 packages/linux/linux-2.6.24/simpad/defconfig |    2 +-
 packages/linux/linux.inc                     |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/linux/linux-2.6.24/simpad/defconfig b/packages/linux/linux-2.6.24/simpad/defconfig
index 2e7352b..a86c365 100644
--- a/packages/linux/linux-2.6.24/simpad/defconfig
+++ b/packages/linux/linux-2.6.24/simpad/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.24
-# Thu Mar  5 21:54:07 2009
+# Thu Mar  5 23:29:13 2009
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index 5e714e1..f3d3bf8 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -124,7 +124,6 @@ do_configure_prepend() {
                 echo "CONFIG_ROOT_NFS=y"                 >> ${S}/.config
                 echo "CONFIG_CMDLINE=\"${CMDLINE_NFSROOT_USB}\"" >> ${S}/.config
         fi
-        yes '' | oe_runmake oldconfig
 }
 
 do_configure_append_avr32() {
@@ -132,7 +131,9 @@ do_configure_append_avr32() {
 }
 
 do_configure_append() {
-        sed -i -e "s:-m0644:-m 0644:g" scripts/Makefile.fwinst
+        if test -e scripts/Makefile.fwinst ; then
+		sed -i -e "s:-m0644:-m 0644:g" scripts/Makefile.fwinst
+	fi
 }
 
 do_compile_append() {