summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox/busybox_1.24.1.bb
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2016-09-14 10:05:46 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-23 15:27:05 +0100
commit8a7607f470ae2a63e9c7b0caddd0db2f6b259053 (patch)
tree412d6907bdf59194bc2750b782cfbe66393365e0 /meta/recipes-core/busybox/busybox_1.24.1.bb
parentcce2867828f34d2364b6bb0598f422aea0a86f6a (diff)
downloadpoky-8a7607f470ae2a63e9c7b0caddd0db2f6b259053.tar.gz
busybox: Avoid race building libbb
When building busybox, an occasional error was observed. The error is consistently the same: libbb/appletlib.c:164:13: error: 'NUM_APPLETS' undeclared (first use in this function) while (i < NUM_APPLETS) { The reason is the include file where NUM_APPLETS is defined is not yet generated (or is being modified) at the time libbb/appletlib.c is compiled. The attached patchset fixes the problem by assuring libb is compiled as the last directory. [YOCTO#10116] (From OE-Core rev: a866a05e2c7d090a77aa6e95339c93e3592703a6) (From OE-Core rev: 6c94afadaa3e035bb58755985a9e193cae5e9b34) Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox/busybox_1.24.1.bb')
-rw-r--r--meta/recipes-core/busybox/busybox_1.24.1.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-core/busybox/busybox_1.24.1.bb b/meta/recipes-core/busybox/busybox_1.24.1.bb
index f370451a3c..df0e131266 100644
--- a/meta/recipes-core/busybox/busybox_1.24.1.bb
+++ b/meta/recipes-core/busybox/busybox_1.24.1.bb
@@ -49,8 +49,10 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
49 file://CVE-2016-2147_2.patch \ 49 file://CVE-2016-2147_2.patch \
50 file://ip_fix_problem_on_mips64_n64_big_endian_musl_systems.patch \ 50 file://ip_fix_problem_on_mips64_n64_big_endian_musl_systems.patch \
51 file://makefile-fix-backport.patch \ 51 file://makefile-fix-backport.patch \
52 file://parallel-make-fix.patch \
53 file://0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch \ 52 file://0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch \
53 file://busybox-kbuild-race-fix-commit-d8e61bb.patch \
54 file://commit-applet_tables-fix-commit-0dddbc1.patch \
55 file://makefile-libbb-race.patch \
54" 56"
55SRC_URI_append_libc-musl = " file://musl.cfg " 57SRC_URI_append_libc-musl = " file://musl.cfg "
56 58