[oe-commits] Ulf Samuelsson : Fix syntax errors when doing make <board> _defconfig in kernel build

[git version control]

Module: openembedded.git
Branch: ulf/linux-2.6.30.2
Commit: 0a0e90dfb312fb3950d36f9fb24c6786e27b66c8
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=0a0e90dfb312fb3950d36f9fb24c6786e27b66c8

Author: Ulf Samuelsson <ulf.samuelsson at atmel.com>
Date:   Wed Aug 12 15:41:59 2009 +0200

Fix syntax errors when doing make <board>_defconfig in kernel build

---

 recipes/linux/linux.inc |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/recipes/linux/linux.inc b/recipes/linux/linux.inc
index aad1ac2..457e77b 100644
--- a/recipes/linux/linux.inc
+++ b/recipes/linux/linux.inc
@@ -54,17 +54,19 @@ python __anonymous () {
 }
 
 do_configure_prepend() {
+	# Traditionally, openembedded linux copies a file defconfig to ${WORKDIR}
 	# If linux source knows about a machine, we can use that config by
 	# 	make <MACHINE>_defconfig
 	#
-        if [ test -n "${LINUX26_DEFCONFIG}" ] ; then
+        if test -n "${LINUX26_DEFCONFIG}"; then
             oe_runmake	${LINUX26_DEFCONFIG}
-	    cp ${WORKDIR}/.config ${WORKDIR}/defconfig
+	    cp ${S}/.config ${WORKDIR}/defconfig
         fi
 
-	# Override default config, if we provide an update not named "defconfig"
-        if [ test -n "${LINUX26_MACHINE}" ] ; then
-            cp ${WORKDIR}/${LINUX26_MACHINE} ${WORKDIR}/defconfig 
+	# if we copy a file, not named "defconfig" to WORKDIR we have to rename it.
+	# we have to specify which machine it is.
+        if test -n "${LINUX26_MACHINE}"; then
+            mv ${WORKDIR}/${LINUX26_MACHINE} ${WORKDIR}/defconfig 
         fi
 
         echo "" > ${S}/.config