diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2014-01-22 10:39:46 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-02 11:22:12 +0000 |
commit | b1ea3455379e38d4e56970505c05b4104d5f1234 (patch) | |
tree | 0900ad3eef7a6bd6d31d18abf0ce932e819da9cb /meta/recipes-core/busybox/busybox_git.bb | |
parent | 47208175027686339dd18df52b60ec2c43594918 (diff) | |
download | poky-b1ea3455379e38d4e56970505c05b4104d5f1234.tar.gz |
busybox: upgrade to stable 1.22.1
Upgrade busybox to the stable release 1.22.1.
During this upgrade, 9 patches are removed. Reasons are detailed below.
The following 6 patches are removed as they have been merged.
meta/recipes-core/busybox/busybox/busybox-lineedit-initialize-delptr.patch
meta/recipes-core/busybox/busybox/busybox-list-suid-and-non-suid-app-configs.patch
meta/recipes-core/busybox/busybox/busybox-sed-fix-sed-clusternewline-testcase.patch
meta/recipes-core/busybox/busybox/busybox-sulogin-empty-root-password.patch
meta/recipes-core/busybox/busybox/find-get-rid-of-nested-functions.patch
meta/recipes-core/busybox/busybox/testsuite-du-du-k-works-fix-false-positive.patch
The following three patches are removed because they are mainly about moving
binaries from /bin to /usr/bin to make the update-alternative work correctly
at rootfs time. We can easily solve this problem by changing recipes. There's
no compelling reason why such patches are needed.
meta/recipes-core/busybox/busybox/run-parts.in.usr-bin.patch
meta/recipes-core/busybox/busybox/stat-usr-bin.patch
meta/recipes-core/busybox/busybox/watch.in.usr-bin.patch
(From OE-Core rev: fa282186d82e8fe3c590d4ea79e464116e5ceea2)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox/busybox_git.bb')
-rw-r--r-- | meta/recipes-core/busybox/busybox_git.bb | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/meta/recipes-core/busybox/busybox_git.bb b/meta/recipes-core/busybox/busybox_git.bb index 91ecff8212..f2cc119400 100644 --- a/meta/recipes-core/busybox/busybox_git.bb +++ b/meta/recipes-core/busybox/busybox_git.bb | |||
@@ -1,16 +1,14 @@ | |||
1 | require busybox.inc | 1 | require busybox.inc |
2 | 2 | ||
3 | SRCREV = "e73f3c1d3d83699b723251f7e6a981021ce75475" | 3 | SRCREV = "d9e0c438e10e2155513e5d26498af472c5137d65" |
4 | # Lookout for PV bump too when SRCREV is changed | 4 | # Lookout for PV bump too when SRCREV is changed |
5 | PV = "1.21.1+git${SRCPV}" | 5 | PV = "1.22.1+git${SRCPV}" |
6 | 6 | ||
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 \ | 10 | file://get_header_tar.patch \ |
11 | file://busybox-appletlib-dependency.patch \ | 11 | file://busybox-appletlib-dependency.patch \ |
12 | file://run-parts.in.usr-bin.patch \ | ||
13 | file://watch.in.usr-bin.patch \ | ||
14 | file://busybox-udhcpc-no_deconfig.patch \ | 12 | file://busybox-udhcpc-no_deconfig.patch \ |
15 | file://find-touchscreen.sh \ | 13 | file://find-touchscreen.sh \ |
16 | file://busybox-cron \ | 14 | file://busybox-cron \ |
@@ -28,18 +26,13 @@ SRC_URI = "git://busybox.net/busybox.git \ | |||
28 | file://mdev.conf \ | 26 | file://mdev.conf \ |
29 | file://umount.busybox \ | 27 | file://umount.busybox \ |
30 | file://defconfig \ | 28 | file://defconfig \ |
31 | file://stat-usr-bin.patch \ | ||
32 | file://busybox-syslog.service.in \ | 29 | file://busybox-syslog.service.in \ |
33 | file://busybox-klogd.service.in \ | 30 | file://busybox-klogd.service.in \ |
34 | file://testsuite-du-du-k-works-fix-false-positive.patch \ | ||
35 | file://fail_on_no_media.patch \ | 31 | file://fail_on_no_media.patch \ |
36 | file://busybox-sulogin-empty-root-password.patch \ | ||
37 | file://run-ptest \ | 32 | file://run-ptest \ |
38 | file://inetd.conf \ | 33 | file://inetd.conf \ |
39 | file://inetd \ | 34 | file://inetd \ |
40 | file://login-utilities.cfg \ | 35 | file://login-utilities.cfg \ |
41 | file://busybox-list-suid-and-non-suid-app-configs.patch \ | ||
42 | file://busybox-sed-fix-sed-clusternewline-testcase.patch \ | ||
43 | " | 36 | " |
44 | 37 | ||
45 | EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y" | 38 | EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y" |