From aa422599ff5730194827030c230829125a4c280e Mon Sep 17 00:00:00 2001
From: Alex Gonzalez <alex.gonzalez@digi.com>
Date: Mon, 17 Dec 2012 11:58:30 +0100
Subject: [PATCH] meta-digi-arm: Fix kernel-module-redpine compilation.

We need to split the EXTRA_OEMAKE flags as the do_make_scripts stage
fails if we pass a "M=" argument.

We override module_do_compile and module_do_install to add the extra
make flags as I have not found a working way of overriding EXTRA_OEMAKE.

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
---
 .../kernel-module-redpine_git.bb              | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine_git.bb b/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine_git.bb
index 73a792760..5a344e245 100644
--- a/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine_git.bb
+++ b/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine_git.bb
@@ -13,7 +13,28 @@ SRC_URI = "${DIGI_LOG_GIT}linux-modules/redpine.git;protocol=git \
 
 S = "${WORKDIR}/git"
 
-EXTRA_OEMAKE += "-C ${STAGING_KERNEL_DIR} M=${S} CONFIG_DEL_KMOD_REDPINE=y"
+EXTRA_OEMAKE = "-C ${STAGING_KERNEL_DIR}"
+EXTRAMAKEFLAGS = "M=${S} CONFIG_DEL_KMOD_REDPINE=y"
+
+module_do_compile() {
+        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+        oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR}   \
+                   KERNEL_SRC=${STAGING_KERNEL_DIR}    \
+                   KERNEL_VERSION=${KERNEL_VERSION}    \
+                   CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
+                   AR="${KERNEL_AR}" \
+		   ${EXTRAMAKEFLAGS} \
+                   ${MAKE_TARGETS}
+}
+
+module_do_install() {
+        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+        oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" \
+                   KERNEL_SRC=${STAGING_KERNEL_DIR} \
+                   CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
+		   ${EXTRAMAKEFLAGS} \
+                   modules_install
+}
 
 do_install_append() {
 	install -d ${D}${sysconfdir}/network/if-pre-up.d