diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-17 12:54:27 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-18 09:27:13 +0100 |
| commit | 8599059164ad0eb908fd1177044af8bc9a9881e4 (patch) | |
| tree | fcfd2d4cf3e3e5c39fed2e8ac376c538b8cec7cb /meta/recipes-core | |
| parent | 10e0c1a3a452baa05d160a92a54b2e33cf0fd061 (diff) | |
| download | openembedded-core-8599059164ad0eb908fd1177044af8bc9a9881e4.tar.gz openembedded-core-8599059164ad0eb908fd1177044af8bc9a9881e4.tar.bz2 openembedded-core-8599059164ad0eb908fd1177044af8bc9a9881e4.zip | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/busybox/busybox/makefile-fix-backport.patch | 40 | ||||
| -rw-r--r-- | meta/recipes-core/busybox/busybox_1.24.1.bb | 1 |
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 @@ +From 9e5820a86277818c2f83c11c2aa76d7f0a38283e Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko <vda.linux@googlemail.com> +Date: Sun, 14 Aug 2016 02:54:27 +0200 +Subject: build system: fix include/NUM_APPLETS.h generation + +TBH, it's more like "work around my bad makefile-fu" than "fix"... + +Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> +--- + applets/Kbuild.src | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +Upstream-Status: Backport + +diff --git a/applets/Kbuild.src b/applets/Kbuild.src +index b612399..5cc1827 100644 +--- a/applets/Kbuild.src ++++ b/applets/Kbuild.src +@@ -29,7 +29,7 @@ applets/applets.o: include/usage_compressed.h include/applet_tables.h + + applets/applet_tables: .config include/applets.h + applets/usage: .config include/applets.h +-applets/usage_pod: .config include/applet_tables.h include/applets.h ++applets/usage_pod: .config include/applets.h include/applet_tables.h include/NUM_APPLETS.h + + quiet_cmd_gen_usage_compressed = GEN include/usage_compressed.h + cmd_gen_usage_compressed = $(srctree_slash)applets/usage_compressed include/usage_compressed.h applets +@@ -40,8 +40,5 @@ include/usage_compressed.h: applets/usage $(srctree_slash)applets/usage_compress + quiet_cmd_gen_applet_tables = GEN include/applet_tables.h + cmd_gen_applet_tables = applets/applet_tables include/applet_tables.h include/NUM_APPLETS.h + +-include/applet_tables.h: applets/applet_tables +- $(call cmd,gen_applet_tables) +- +-include/NUM_APPLETS.h: applets/applet_tables ++include/applet_tables.h include/NUM_APPLETS.h: applets/applet_tables + $(call cmd,gen_applet_tables) +-- +cgit v0.12 + 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 \ file://CVE-2016-2147.patch \ file://CVE-2016-2147_2.patch \ file://ip_fix_problem_on_mips64_n64_big_endian_musl_systems.patch \ + file://makefile-fix-backport.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " |