From a6f0bced4c15f93a5e1c1b8782aa5dc6ca8d1113 Mon Sep 17 00:00:00 2001 From: Juro Bystricky Date: Wed, 14 Sep 2016 10:05:46 -0700 Subject: 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) Signed-off-by: Juro Bystricky Signed-off-by: Richard Purdie --- meta/recipes-core/busybox/busybox_1.24.1.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta/recipes-core/busybox/busybox_1.24.1.bb') 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 \ file://CVE-2016-2147_2.patch \ file://ip_fix_problem_on_mips64_n64_big_endian_musl_systems.patch \ file://makefile-fix-backport.patch \ - file://parallel-make-fix.patch \ file://0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch \ + file://busybox-kbuild-race-fix-commit-d8e61bb.patch \ + file://commit-applet_tables-fix-commit-0dddbc1.patch \ + file://makefile-libbb-race.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " -- cgit v1.2.3-54-g00ecf