diff options
| author |   Chen Qi <Qi.Chen@windriver.com> | 2016-12-22 16:37:00 +0800 |
|---|---|---|
| committer | Chen Qi <Qi.Chen@windriver.com> | 2017-01-03 16:45:12 +0800 |
| commit | 0615a5dfe258d66aee2b41a980536bbffe6874de (patch) | |
| tree | 45b4020569a6f7e0812d9a511d36478b0b65e86f /meta/recipes-core/busybox/busybox/makefile-fix-backport.patch | |
| parent | 425afe2484707640ac71194885fdb263e95e9950 (diff) | |
| download | openembedded-core-contrib-ChenQi/busybox-1.25.1.tar.gz | |
busybox: upgrade to 1.25.1ChenQi/busybox-1.25.1
Upgrade busybox to 1.25.1. Also upgrade the git version to the corresponding
commit.
Patches backported, merged or the problem it covers is solved in another way
upstream are removed. Other patches are rebased.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Diffstat (limited to 'meta/recipes-core/busybox/busybox/makefile-fix-backport.patch')
| -rw-r--r-- | meta/recipes-core/busybox/busybox/makefile-fix-backport.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/meta/recipes-core/busybox/busybox/makefile-fix-backport.patch b/meta/recipes-core/busybox/busybox/makefile-fix-backport.patch deleted file mode 100644 index 2e9842e5ec..0000000000 --- a/meta/recipes-core/busybox/busybox/makefile-fix-backport.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 - |