Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Javier Viguera 2015-03-12 14:44:58 +01:00
parent b386710979
commit c451c96dd6
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta-digi-arm/recipes-kernel/kernel-module-atheros/kernel-module-atheros.bb
View File

@ -34,7 +34,7 @@ SRC_URI_append_ccimx6 = " \
S = "${WORKDIR}/git" 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() { do_configure_prepend() {
cp ${WORKDIR}/Makefile ${S}/ cp ${WORKDIR}/Makefile ${S}/
@ -65,5 +65,4 @@ FILES_${PN} += " \
${sysconfdir}/network/ \ ${sysconfdir}/network/ \
" "
PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "(ccardimx28|ccimx6)" COMPATIBLE_MACHINE = "(ccardimx28|ccimx6)"

3
meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine.bb
View File

@ -27,7 +27,7 @@ SRC_URI += " \
S = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${WORKDIR}/git', '${WORKDIR}/${MACHINE}', d)}" 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() { do_configure_prepend() {
cp ${WORKDIR}/Makefile ${S}/ cp ${WORKDIR}/Makefile ${S}/
@ -59,5 +59,4 @@ FILES_${PN} += " \
${sysconfdir}/network/ \ ${sysconfdir}/network/ \
" "
PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "(mx5)" COMPATIBLE_MACHINE = "(mx5)"