diff options
author | Maxin B. John <maxin.john@intel.com> | 2016-02-17 13:01:11 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-18 07:39:31 +0000 |
commit | c7355b90d0abc401497e35f7c017d7db1a22d427 (patch) | |
tree | 96f69da9169aad55d90ef69b8bdcde596dd11f90 | |
parent | 47d011963b9b034f2f5bf06310977153de0df449 (diff) | |
download | poky-c7355b90d0abc401497e35f7c017d7db1a22d427.tar.gz |
busybox: drop patches that are not valid anymore
1. Removed following patches
a) busybox-appletlib-dependency.patch
- Kbuild rules handles that dependency
b) get_header_tar.patch
- tar applet uses a different code path to handle that scenario now.
2. Updated the upstream-status of fail_on_no_media.patch as Denied.
(From OE-Core rev: 48f5c2962a4121ba6172b535c90eaa16e8afa538)
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 files changed, 2 insertions, 64 deletions
diff --git a/meta/recipes-core/busybox/busybox/busybox-appletlib-dependency.patch b/meta/recipes-core/busybox/busybox/busybox-appletlib-dependency.patch deleted file mode 100644 index de2dbcceb1..0000000000 --- a/meta/recipes-core/busybox/busybox/busybox-appletlib-dependency.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | # copy commit message from OE as the patch comment: | ||
4 | # commit 98c24291aa165f53423c27ae033831ce0b3bb676 | ||
5 | # Author: Roman I Khimov <khimov@altell.ru> | ||
6 | # Date: Thu Mar 26 23:03:58 2009 +0000 | ||
7 | # | ||
8 | # busybox: update appletlib dependency patch | ||
9 | # | ||
10 | # Previous version still failed from time to time on clean-start builds | ||
11 | # with 4 bitbake threads and '-j16'. Building busybox as sole target worked | ||
12 | # well. | ||
13 | # | ||
14 | # The reason is that previous version introduced a race between applets make | ||
15 | # processes spawned from top-level Makefile and from libbb Makefile. | ||
16 | # | ||
17 | # Fix it with high-level dependency that doesn't create races. | ||
18 | # | ||
19 | # Signed-off-by: Koen Kooi <koen@openembedded.org> | ||
20 | # | ||
21 | # above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06 | ||
22 | |||
23 | Index: busybox-1.13.2/Makefile | ||
24 | =================================================================== | ||
25 | --- busybox-1.13.2.orig/Makefile 2009-03-19 15:44:37.419270265 +0300 | ||
26 | +++ busybox-1.13.2/Makefile 2009-03-19 15:45:57.737521296 +0300 | ||
27 | @@ -471,6 +471,10 @@ | ||
28 | util-linux/ \ | ||
29 | util-linux/volume_id/ \ | ||
30 | |||
31 | +# Lib interdeps | ||
32 | +# libbb uses headers generated in applets | ||
33 | +libbb: applets | ||
34 | + | ||
35 | endif # KBUILD_EXTMOD | ||
36 | |||
37 | ifeq ($(dot-config),1) | ||
diff --git a/meta/recipes-core/busybox/busybox/fail_on_no_media.patch b/meta/recipes-core/busybox/busybox/fail_on_no_media.patch index 6745f169fe..820acc2684 100644 --- a/meta/recipes-core/busybox/busybox/fail_on_no_media.patch +++ b/meta/recipes-core/busybox/busybox/fail_on_no_media.patch | |||
@@ -1,4 +1,5 @@ | |||
1 | Upstream-Status: Pending | 1 | Upstream-Status: Denied |
2 | [https://www.mail-archive.com/busybox@busybox.net/msg22354.html] | ||
2 | 3 | ||
3 | The current behaviour of busybox is to try all fstype when automounting | 4 | The current behaviour of busybox is to try all fstype when automounting |
4 | even when no media exists. The util-linux mount command bails when no | 5 | even when no media exists. The util-linux mount command bails when no |
diff --git a/meta/recipes-core/busybox/busybox/get_header_tar.patch b/meta/recipes-core/busybox/busybox/get_header_tar.patch deleted file mode 100644 index 0e528ff91f..0000000000 --- a/meta/recipes-core/busybox/busybox/get_header_tar.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | # copy commit message from OE as the patch comment: | ||
4 | # commit 5a0e1d473ca7aca5ffefffe9a2ec44ae7a1f35bc | ||
5 | # Author: Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | ||
6 | # Date: Wed Feb 11 22:40:21 2009 +0100 | ||
7 | # | ||
8 | # busybox: fix tar problem with filenames that are exactly 100 bytes | ||
9 | # | ||
10 | # above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06 | ||
11 | |||
12 | --- busybox-1.13.2/archival/libarchive/get_header_tar.c.orig 2008-11-09 18:28:02.000000000 +0100 | ||
13 | +++ busybox-1.13.2/archival/libarchive/get_header_tar.c 2009-02-11 22:34:52.000000000 +0100 | ||
14 | @@ -252,6 +252,8 @@ | ||
15 | file_header->name = concat_path_file(tar.prefix, tar.name); | ||
16 | } else | ||
17 | file_header->name = xstrdup(tar.name); | ||
18 | + if (strlen(file_header->name) > 100) | ||
19 | + file_header->name[100] = 0; | ||
20 | } | ||
21 | |||
22 | /* Set bits 12-15 of the files mode */ | ||
diff --git a/meta/recipes-core/busybox/busybox_1.24.1.bb b/meta/recipes-core/busybox/busybox_1.24.1.bb index 72c5c79cde..174ca472cd 100644 --- a/meta/recipes-core/busybox/busybox_1.24.1.bb +++ b/meta/recipes-core/busybox/busybox_1.24.1.bb | |||
@@ -1,8 +1,6 @@ | |||
1 | require busybox.inc | 1 | require busybox.inc |
2 | 2 | ||
3 | SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | 3 | SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ |
4 | file://get_header_tar.patch \ | ||
5 | file://busybox-appletlib-dependency.patch \ | ||
6 | file://busybox-udhcpc-no_deconfig.patch \ | 4 | file://busybox-udhcpc-no_deconfig.patch \ |
7 | file://find-touchscreen.sh \ | 5 | file://find-touchscreen.sh \ |
8 | file://busybox-cron \ | 6 | file://busybox-cron \ |
diff --git a/meta/recipes-core/busybox/busybox_git.bb b/meta/recipes-core/busybox/busybox_git.bb index e590543d8c..ae16b5935a 100644 --- a/meta/recipes-core/busybox/busybox_git.bb +++ b/meta/recipes-core/busybox/busybox_git.bb | |||
@@ -7,8 +7,6 @@ PV = "1.25.0+git${SRCPV}" | |||
7 | S = "${WORKDIR}/git" | 7 | S = "${WORKDIR}/git" |
8 | 8 | ||
9 | SRC_URI = "git://busybox.net/busybox.git \ | 9 | SRC_URI = "git://busybox.net/busybox.git \ |
10 | file://get_header_tar.patch \ | ||
11 | file://busybox-appletlib-dependency.patch \ | ||
12 | file://busybox-udhcpc-no_deconfig.patch \ | 10 | file://busybox-udhcpc-no_deconfig.patch \ |
13 | file://find-touchscreen.sh \ | 11 | file://find-touchscreen.sh \ |
14 | file://busybox-cron \ | 12 | file://busybox-cron \ |