summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2015-10-05 17:23:31 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:32:11 +0000
commit3648a37b2d7d767061c43fa8f6aea56aa58d9afe (patch)
tree55af6e4668a4f9161d048d18ed52d2b26246ae4b
parentbf28ea907feae0487fffa501e4fb9649928e8216 (diff)
downloadpoky-contrib-3648a37b2d7d767061c43fa8f6aea56aa58d9afe.tar.gz
poky-contrib-3648a37b2d7d767061c43fa8f6aea56aa58d9afe.tar.bz2
poky-contrib-3648a37b2d7d767061c43fa8f6aea56aa58d9afe.zip
busybox.inc: remove '-e MAKEFLAGS=' from EXTRA_OEMAKE
Busybox Kbuild likes to control its own MAKEFLAGS (it adds -rR, etc), so avoid over-riding MAKEFLAGS. Relying on 'make -e' is no longer required so remove that too. (From OE-Core rev: 1d841e103b229bf70a1c24c1cc22b7bdc8c9bf64) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/busybox/busybox.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 1293b0762e3..fba956ee196 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -18,7 +18,8 @@ BUSYBOX_SPLIT_SUID ?= "1"
export EXTRA_CFLAGS = "${CFLAGS}"
export EXTRA_LDFLAGS = "${LDFLAGS}"
-EXTRA_OEMAKE += "CC='${CC}' LD='${CCLD}' V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y"
+# We don't want '-e MAKEFLAGS=' in EXTRA_OEMAKE
+EXTRA_OEMAKE = "CC='${CC}' LD='${CCLD}' V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y"
PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock"