summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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+