aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes/base.bbclass
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:17 +0000
commit51707282fc2c5a74588b2d79b2229513a883924f (patch)
treed1c453789ce4f2ccbfa97af458f002d41e0cdf51 /meta/classes/base.bbclass
parent8240975b937197aee5ab1d651997fe500e8bbd91 (diff)
downloadopenembedded-core-contrib-51707282fc2c5a74588b2d79b2229513a883924f.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. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/base.bbclass')
-rw-r--r--meta/classes/base.bbclass8
1 files changed, 6 insertions, 2 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() {
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"
}