From c451c96dd68bbbb8679d65efe2ad9ac9763e7781 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Thu, 12 Mar 2015 14:44:58 +0100
Subject: [PATCH] meta-digi-arm: do not override EXTRA_OEMAKE variable

We need to append our config to EXTRA_OEMAKE variable instead of
overriding it, because otherwise we lose some config from the
environment (e.g. KERNEL_SRC) and the build fails with:

make: *** M=...kernel-module-.../git: No such file or directory

Also remove redundant PACKAGE_ARCH setting, as it's inherited from
module-base class.

https://jira.digi.com/browse/DEL-1558

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../kernel-module-atheros/kernel-module-atheros.bb             | 3 +--
 .../kernel-module-redpine/kernel-module-redpine.bb             | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb
index 13fc0d07b..c4b03103a 100644
--- a/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb
+++ b/meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb
@@ -34,7 +34,7 @@ SRC_URI_append_ccimx6 = " \
 
 S = "${WORKDIR}/git"
 
-EXTRA_OEMAKE = "DEL_PLATFORM=${MACHINE} KLIB_BUILD=${STAGING_KERNEL_DIR}"
+EXTRA_OEMAKE += "DEL_PLATFORM=${MACHINE} KLIB_BUILD=${STAGING_KERNEL_DIR}"
 
 do_configure_prepend() {
 	cp ${WORKDIR}/Makefile ${S}/
@@ -65,5 +65,4 @@ FILES_${PN} += " \
     ${sysconfdir}/network/ \
 "
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(ccardimx28|ccimx6)"
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine.bb b/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine.bb
index 09b8a3256..cfd534f02 100644
--- a/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine.bb
+++ b/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine.bb
@@ -27,7 +27,7 @@ SRC_URI += " \
 
 S = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${WORKDIR}/git', '${WORKDIR}/${MACHINE}', d)}"
 
-EXTRA_OEMAKE = "DEL_PLATFORM=${MACHINE}"
+EXTRA_OEMAKE += "DEL_PLATFORM=${MACHINE}"
 
 do_configure_prepend() {
 	cp ${WORKDIR}/Makefile ${S}/
@@ -59,5 +59,4 @@ FILES_${PN} += " \
     ${sysconfdir}/network/ \
 "
 
-PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(mx5)"