From 51707282fc2c5a74588b2d79b2229513a883924f Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 12 Feb 2014 13:54:17 -0200 Subject: 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. Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'meta/classes/base.bbclass') 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() { 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" } -- cgit 1.2.3-korg