diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2014-02-12 13:54:17 -0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-13 11:41:22 +0000 |
| commit | 937a12ddb8693f31a7dd96600172d7c86df4f9b1 (patch) | |
| tree | 3c242c8e989c68c58e857b1e6130fe609cb18d43 /meta/classes | |
| parent | adc21724d89601be886a0b2b1b910c7e794ccaa0 (diff) | |
| download | ast2050-yocto-poky-937a12ddb8693f31a7dd96600172d7c86df4f9b1.zip ast2050-yocto-poky-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/classes')
| -rw-r--r-- | meta/classes/base.bbclass | 8 | ||||
| -rw-r--r-- | meta/classes/kernel.bbclass | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 81fc305..7837c89 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -53,9 +53,13 @@ die() { bbfatal "$*" } -oe_runmake() { +oe_runmake_call() { bbnote ${MAKE} ${EXTRA_OEMAKE} "$@" - ${MAKE} ${EXTRA_OEMAKE} "$@" || die "oe_runmake failed" + ${MAKE} ${EXTRA_OEMAKE} "$@" +} + +oe_runmake() { + oe_runmake_call "$@" || die "oe_runmake failed" } diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 3003fb1..6953109 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -313,7 +313,7 @@ python sysroot_stage_all () { oe.path.copyhardlinktree(d.expand("${D}${KERNEL_SRC_PATH}"), d.expand("${SYSROOT_DESTDIR}${KERNEL_SRC_PATH}")) } -KERNEL_CONFIG_COMMAND ?= "oe_runmake oldnoconfig || yes '' | oe_runmake oldconfig" +KERNEL_CONFIG_COMMAND ?= "oe_runmake_call oldnoconfig || yes '' | oe_runmake oldconfig" kernel_do_configure() { # fixes extra + in /lib/modules/2.6.37+ |
