summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-02-12 13:54:17 -0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-13 11:41:22 +0000
commit937a12ddb8693f31a7dd96600172d7c86df4f9b1 (patch)
tree3c242c8e989c68c58e857b1e6130fe609cb18d43 /meta
parentadc21724d89601be886a0b2b1b910c7e794ccaa0 (diff)
downloadpoky-937a12ddb8693f31a7dd96600172d7c86df4f9b1.tar.gz
kernel.bbclass, base.bbclass: Fix support for old kernel configuration
This solves a regression introduced by OE-Core:9b75f6a (kernel: use oldnoconfig before yes '' | make oldconfig). The original oe_runmake explicitly calls 'die' command in case of failure so the fallback code never runs. The fallback code needs to handle the oe_runmake return code to call the backward compatible callback so we introduced a new command called oe_runmake_call which is used by oe_runmake. This does not change the functional behaviour of oe_runmake so it avoids any change except for the code which does need to handle the oe_runmake exit code. (From OE-Core rev: 51707282fc2c5a74588b2d79b2229513a883924f) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/base.bbclass8
-rw-r--r--meta/classes/kernel.bbclass2
2 files changed, 7 insertions, 3 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 81fc30590a..7837c892e5 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -53,9 +53,13 @@ die() {
53 bbfatal "$*" 53 bbfatal "$*"
54} 54}
55 55
56oe_runmake() { 56oe_runmake_call() {
57 bbnote ${MAKE} ${EXTRA_OEMAKE} "$@" 57 bbnote ${MAKE} ${EXTRA_OEMAKE} "$@"
58 ${MAKE} ${EXTRA_OEMAKE} "$@" || die "oe_runmake failed" 58 ${MAKE} ${EXTRA_OEMAKE} "$@"
59}
60
61oe_runmake() {
62 oe_runmake_call "$@" || die "oe_runmake failed"
59} 63}
60 64
61 65
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 3003fb1624..6953109e8b 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -313,7 +313,7 @@ python sysroot_stage_all () {
313 oe.path.copyhardlinktree(d.expand("${D}${KERNEL_SRC_PATH}"), d.expand("${SYSROOT_DESTDIR}${KERNEL_SRC_PATH}")) 313 oe.path.copyhardlinktree(d.expand("${D}${KERNEL_SRC_PATH}"), d.expand("${SYSROOT_DESTDIR}${KERNEL_SRC_PATH}"))
314} 314}
315 315
316KERNEL_CONFIG_COMMAND ?= "oe_runmake oldnoconfig || yes '' | oe_runmake oldconfig" 316KERNEL_CONFIG_COMMAND ?= "oe_runmake_call oldnoconfig || yes '' | oe_runmake oldconfig"
317 317
318kernel_do_configure() { 318kernel_do_configure() {
319 # fixes extra + in /lib/modules/2.6.37+ 319 # fixes extra + in /lib/modules/2.6.37+