* [PATCH 1/7] busybox_git: Enable getopt applet
2015-10-06 3:19 [PATCH 0/7] busybox fixes and cleanups Andre McCurdy
@ 2015-10-06 3:19 ` Andre McCurdy
2015-10-06 3:19 ` [PATCH 2/7] busybox.inc: don't export EXTRA_OEMAKE Andre McCurdy
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Andre McCurdy @ 2015-10-06 3:19 UTC (permalink / raw)
To: openembedded-core
Keep git recipe in sync with 1.23.2:
http://git.openembedded.org/openembedded-core/commit/?id=10c2c484d5916ad476ad7717c3629f6684f01e6d
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/recipes-core/busybox/busybox_git.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-core/busybox/busybox_git.bb b/meta/recipes-core/busybox/busybox_git.bb
index ade72f4..ed1c0a8 100644
--- a/meta/recipes-core/busybox/busybox_git.bb
+++ b/meta/recipes-core/busybox/busybox_git.bb
@@ -41,6 +41,7 @@ SRC_URI = "git://busybox.net/busybox.git \
file://mount-via-label.cfg \
file://sha1sum.cfg \
file://sha256sum.cfg \
+ file://getopts.cfg \
"
EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y"
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/7] busybox.inc: don't export EXTRA_OEMAKE
2015-10-06 3:19 [PATCH 0/7] busybox fixes and cleanups Andre McCurdy
2015-10-06 3:19 ` [PATCH 1/7] busybox_git: Enable getopt applet Andre McCurdy
@ 2015-10-06 3:19 ` Andre McCurdy
2015-10-06 3:19 ` [PATCH 3/7] busybox: move common EXTRA_OEMAKE options into busybox.inc Andre McCurdy
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Andre McCurdy @ 2015-10-06 3:19 UTC (permalink / raw)
To: openembedded-core
EXTRA_OEMAKE is private to OE and shouldn't be exported to
the busybox build.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/recipes-core/busybox/busybox.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 4d4709a..235bda2 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -17,7 +17,8 @@ BUSYBOX_SPLIT_SUID ?= "1"
export EXTRA_CFLAGS = "${CFLAGS}"
export EXTRA_LDFLAGS = "${LDFLAGS}"
-export EXTRA_OEMAKE += "'LD=${CCLD}'"
+
+EXTRA_OEMAKE += "'LD=${CCLD}'"
PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock"
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/7] busybox: move common EXTRA_OEMAKE options into busybox.inc
2015-10-06 3:19 [PATCH 0/7] busybox fixes and cleanups Andre McCurdy
2015-10-06 3:19 ` [PATCH 1/7] busybox_git: Enable getopt applet Andre McCurdy
2015-10-06 3:19 ` [PATCH 2/7] busybox.inc: don't export EXTRA_OEMAKE Andre McCurdy
@ 2015-10-06 3:19 ` Andre McCurdy
2015-10-06 3:19 ` [PATCH 4/7] busybox.inc: explicitly include CC=${CC} on make command line Andre McCurdy
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Andre McCurdy @ 2015-10-06 3:19 UTC (permalink / raw)
To: openembedded-core
Current EXTRA_OEMAKE options are common to all supported versions of
busybox (1.23.2 and git), so move from version specific recipes into
busybox.inc.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/recipes-core/busybox/busybox.inc | 1 +
meta/recipes-core/busybox/busybox_1.23.2.bb | 2 --
meta/recipes-core/busybox/busybox_git.bb | 2 --
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 235bda2..949047b 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -19,6 +19,7 @@ export EXTRA_CFLAGS = "${CFLAGS}"
export EXTRA_LDFLAGS = "${LDFLAGS}"
EXTRA_OEMAKE += "'LD=${CCLD}'"
+EXTRA_OEMAKE += "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"
diff --git a/meta/recipes-core/busybox/busybox_1.23.2.bb b/meta/recipes-core/busybox/busybox_1.23.2.bb
index 2559823..554c816 100644
--- a/meta/recipes-core/busybox/busybox_1.23.2.bb
+++ b/meta/recipes-core/busybox/busybox_1.23.2.bb
@@ -44,8 +44,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
SRC_URI[tarball.md5sum] = "7925683d7dd105aabe9b6b618d48cc73"
SRC_URI[tarball.sha256sum] = "05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a"
-EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y"
-
do_install_ptest () {
cp -r ${B}/testsuite ${D}${PTEST_PATH}/
cp ${B}/.config ${D}${PTEST_PATH}/
diff --git a/meta/recipes-core/busybox/busybox_git.bb b/meta/recipes-core/busybox/busybox_git.bb
index ed1c0a8..17de8ac 100644
--- a/meta/recipes-core/busybox/busybox_git.bb
+++ b/meta/recipes-core/busybox/busybox_git.bb
@@ -44,8 +44,6 @@ SRC_URI = "git://busybox.net/busybox.git \
file://getopts.cfg \
"
-EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y"
-
do_install_ptest () {
cp -r ${B}/testsuite ${D}${PTEST_PATH}/
cp ${B}/.config ${D}${PTEST_PATH}/
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/7] busybox.inc: explicitly include CC=${CC} on make command line
2015-10-06 3:19 [PATCH 0/7] busybox fixes and cleanups Andre McCurdy
` (2 preceding siblings ...)
2015-10-06 3:19 ` [PATCH 3/7] busybox: move common EXTRA_OEMAKE options into busybox.inc Andre McCurdy
@ 2015-10-06 3:19 ` Andre McCurdy
2015-10-06 3:19 ` [PATCH 5/7] busybox.inc: don't set .config CROSS_COMPILER_PREFIX Andre McCurdy
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Andre McCurdy @ 2015-10-06 3:19 UTC (permalink / raw)
To: openembedded-core
The busybox build currently relies on 'make -e' to over-ride CC and
the make command line to over-ride LD. Add CC to the make command line
to make the CC over-ride more explicit and consistent with LD.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/recipes-core/busybox/busybox.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 949047b..a4ecfa4 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -18,7 +18,7 @@ BUSYBOX_SPLIT_SUID ?= "1"
export EXTRA_CFLAGS = "${CFLAGS}"
export EXTRA_LDFLAGS = "${LDFLAGS}"
-EXTRA_OEMAKE += "'LD=${CCLD}'"
+EXTRA_OEMAKE += "'CC=${CC}' 'LD=${CCLD}'"
EXTRA_OEMAKE += "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"
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 5/7] busybox.inc: don't set .config CROSS_COMPILER_PREFIX
2015-10-06 3:19 [PATCH 0/7] busybox fixes and cleanups Andre McCurdy
` (3 preceding siblings ...)
2015-10-06 3:19 ` [PATCH 4/7] busybox.inc: explicitly include CC=${CC} on make command line Andre McCurdy
@ 2015-10-06 3:19 ` Andre McCurdy
2015-10-06 3:19 ` [PATCH 6/7] busybox.inc: fix CONFIG_EXTRA_CFLAGS configmangle Andre McCurdy
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Andre McCurdy @ 2015-10-06 3:19 UTC (permalink / raw)
To: openembedded-core
Setting CROSS_COMPILER_PREFIX via .config is redundant (setting
CROSS_COMPILE via the make command line will always over-ride it).
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/recipes-core/busybox/busybox.inc | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index a4ecfa4..48a28bc 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -81,8 +81,7 @@ def features_to_busybox_del(d):
cnf, rem = features_to_busybox_settings(d)
return rem
-configmangle = '/CROSS_COMPILER_PREFIX/d; \
- /CONFIG_EXTRA_CFLAGS/d; \
+configmangle = '/CONFIG_EXTRA_CFLAGS/d; \
'
OE_FEATURES := "${@features_to_busybox_conf(d)}"
OE_DEL := "${@features_to_busybox_del(d)}"
@@ -98,8 +97,7 @@ python () {
("\\n".join((d.expand("${OE_FEATURES}").split("\n")))))
d.setVar('configmangle_append',
"/^### CROSS$/a\\\n%s\n" %
- ("\\n".join(["CONFIG_CROSS_COMPILER_PREFIX=\"${TARGET_PREFIX}\"",
- "CONFIG_EXTRA_CFLAGS=\"${CFLAGS}\" \"${HOST_CC_ARCH}\""
+ ("\\n".join(["CONFIG_EXTRA_CFLAGS=\"${CFLAGS}\" \"${HOST_CC_ARCH}\""
])
))
}
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 6/7] busybox.inc: fix CONFIG_EXTRA_CFLAGS configmangle
2015-10-06 3:19 [PATCH 0/7] busybox fixes and cleanups Andre McCurdy
` (4 preceding siblings ...)
2015-10-06 3:19 ` [PATCH 5/7] busybox.inc: don't set .config CROSS_COMPILER_PREFIX Andre McCurdy
@ 2015-10-06 3:19 ` Andre McCurdy
2015-10-06 3:19 ` [PATCH 7/7] busybox.inc: remove MAKEFLAGS over-ride from EXTRA_OEMAKE Andre McCurdy
2015-10-06 3:54 ` [PATCH 0/7] busybox fixes and cleanups Khem Raj
7 siblings, 0 replies; 9+ messages in thread
From: Andre McCurdy @ 2015-10-06 3:19 UTC (permalink / raw)
To: openembedded-core
With current busybox Kbuild, setting .config to:
CONFIG_EXTRA_CFLAGS="foo" "bar"
and then running 'make oldconfig' results in .config containing:
CONFIG_EXTRA_CFLAGS="foo"
ie the CONFIG_EXTRA_CFLAGS configmangle in the busybox.inc doesn't
currently work as intended. Remove the extra \" \" to ensure that
${HOST_CC_ARCH} gets added to CONFIG_EXTRA_CFLAGS.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/recipes-core/busybox/busybox.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 48a28bc..b380860 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -97,7 +97,7 @@ python () {
("\\n".join((d.expand("${OE_FEATURES}").split("\n")))))
d.setVar('configmangle_append',
"/^### CROSS$/a\\\n%s\n" %
- ("\\n".join(["CONFIG_EXTRA_CFLAGS=\"${CFLAGS}\" \"${HOST_CC_ARCH}\""
+ ("\\n".join(["CONFIG_EXTRA_CFLAGS=\"${CFLAGS} ${HOST_CC_ARCH}\""
])
))
}
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 7/7] busybox.inc: remove MAKEFLAGS over-ride from EXTRA_OEMAKE
2015-10-06 3:19 [PATCH 0/7] busybox fixes and cleanups Andre McCurdy
` (5 preceding siblings ...)
2015-10-06 3:19 ` [PATCH 6/7] busybox.inc: fix CONFIG_EXTRA_CFLAGS configmangle Andre McCurdy
@ 2015-10-06 3:19 ` Andre McCurdy
2015-10-06 3:54 ` [PATCH 0/7] busybox fixes and cleanups Khem Raj
7 siblings, 0 replies; 9+ messages in thread
From: Andre McCurdy @ 2015-10-06 3:19 UTC (permalink / raw)
To: openembedded-core
Busybox Kbuild likes to control its own MAKEFLAGS (it adds -rR,
etc), so avoid over-riding MAKEFLAGS via EXTRA_OEMAKE.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/recipes-core/busybox/busybox.inc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index b380860..878e2bb 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -18,6 +18,10 @@ BUSYBOX_SPLIT_SUID ?= "1"
export EXTRA_CFLAGS = "${CFLAGS}"
export EXTRA_LDFLAGS = "${LDFLAGS}"
+# Busybox Kbuild likes to control its own MAKEFLAGS (it adds -rR,
+# etc), so avoid over-riding MAKEFLAGS via EXTRA_OEMAKE.
+EXTRA_OEMAKE = "-e"
+
EXTRA_OEMAKE += "'CC=${CC}' 'LD=${CCLD}'"
EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y"
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 0/7] busybox fixes and cleanups
2015-10-06 3:19 [PATCH 0/7] busybox fixes and cleanups Andre McCurdy
` (6 preceding siblings ...)
2015-10-06 3:19 ` [PATCH 7/7] busybox.inc: remove MAKEFLAGS over-ride from EXTRA_OEMAKE Andre McCurdy
@ 2015-10-06 3:54 ` Khem Raj
7 siblings, 0 replies; 9+ messages in thread
From: Khem Raj @ 2015-10-06 3:54 UTC (permalink / raw)
To: Andre McCurdy; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 861 bytes --]
> On Oct 5, 2015, at 8:19 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
>
> Further busybox recipe cleanups, to be applied on top of:
>
> busybox.inc: remove redundant @DATADIR@ replacement
>
> Andre McCurdy (7):
> busybox_git: Enable getopt applet
> busybox.inc: don't export EXTRA_OEMAKE
> busybox: move common EXTRA_OEMAKE options into busybox.inc
> busybox.inc: explicitly include CC=${CC} on make command line
> busybox.inc: don't set .config CROSS_COMPILER_PREFIX
> busybox.inc: fix CONFIG_EXTRA_CFLAGS configmangle
> busybox.inc: remove MAKEFLAGS over-ride from EXTRA_OEMAKE
>
> meta/recipes-core/busybox/busybox.inc | 14 +++++++++-----
> meta/recipes-core/busybox/busybox_1.23.2.bb | 2 --
> meta/recipes-core/busybox/busybox_git.bb | 3 +--
> 3 files changed, 10 insertions(+), 9 deletions(-)
>
LGTM
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread