summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-17 12:54:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-18 09:27:52 +0100
commitd3d395b939b2fbac4bcd06cbd544bca987f24348 (patch)
treeacf2cba3ba04fcb1f2d9e410351a8e919fbbec8b
parentd37837a00d0b892c9d11f4ae013f5e389ff3f49d (diff)
downloadpoky-d3d395b939b2fbac4bcd06cbd544bca987f24348.tar.gz
busybox: Backport makefile fix from upstream
This at least partially addresses one of the build races we've seen on the autobuilder in busybox. Its a straightforward backport from upstream. (From OE-Core rev: 8599059164ad0eb908fd1177044af8bc9a9881e4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/busybox/busybox/makefile-fix-backport.patch40
-rw-r--r--meta/recipes-core/busybox/busybox_1.24.1.bb1
2 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox/makefile-fix-backport.patch b/meta/recipes-core/busybox/busybox/makefile-fix-backport.patch
new file mode 100644
index 0000000000..2e9842e5ec
--- /dev/null
+++ b/meta/recipes-core/busybox/busybox/makefile-fix-backport.patch
@@ -0,0 +1,40 @@
1From 9e5820a86277818c2f83c11c2aa76d7f0a38283e Mon Sep 17 00:00:00 2001
2From: Denys Vlasenko <vda.linux@googlemail.com>
3Date: Sun, 14 Aug 2016 02:54:27 +0200
4Subject: build system: fix include/NUM_APPLETS.h generation
5
6TBH, it's more like "work around my bad makefile-fu" than "fix"...
7
8Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
9---
10 applets/Kbuild.src | 7 ++-----
11 1 file changed, 2 insertions(+), 5 deletions(-)
12
13Upstream-Status: Backport
14
15diff --git a/applets/Kbuild.src b/applets/Kbuild.src
16index b612399..5cc1827 100644
17--- a/applets/Kbuild.src
18+++ b/applets/Kbuild.src
19@@ -29,7 +29,7 @@ applets/applets.o: include/usage_compressed.h include/applet_tables.h
20
21 applets/applet_tables: .config include/applets.h
22 applets/usage: .config include/applets.h
23-applets/usage_pod: .config include/applet_tables.h include/applets.h
24+applets/usage_pod: .config include/applets.h include/applet_tables.h include/NUM_APPLETS.h
25
26 quiet_cmd_gen_usage_compressed = GEN include/usage_compressed.h
27 cmd_gen_usage_compressed = $(srctree_slash)applets/usage_compressed include/usage_compressed.h applets
28@@ -40,8 +40,5 @@ include/usage_compressed.h: applets/usage $(srctree_slash)applets/usage_compress
29 quiet_cmd_gen_applet_tables = GEN include/applet_tables.h
30 cmd_gen_applet_tables = applets/applet_tables include/applet_tables.h include/NUM_APPLETS.h
31
32-include/applet_tables.h: applets/applet_tables
33- $(call cmd,gen_applet_tables)
34-
35-include/NUM_APPLETS.h: applets/applet_tables
36+include/applet_tables.h include/NUM_APPLETS.h: applets/applet_tables
37 $(call cmd,gen_applet_tables)
38--
39cgit v0.12
40
diff --git a/meta/recipes-core/busybox/busybox_1.24.1.bb b/meta/recipes-core/busybox/busybox_1.24.1.bb
index d3dc2a2947..7edd32dcd3 100644
--- a/meta/recipes-core/busybox/busybox_1.24.1.bb
+++ b/meta/recipes-core/busybox/busybox_1.24.1.bb
@@ -48,6 +48,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
48 file://CVE-2016-2147.patch \ 48 file://CVE-2016-2147.patch \
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" 52"
52SRC_URI_append_libc-musl = " file://musl.cfg " 53SRC_URI_append_libc-musl = " file://musl.cfg "
53 54