aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox/busybox_git.bb
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-01-22 10:39:46 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-02 11:21:56 +0000
commitfa282186d82e8fe3c590d4ea79e464116e5ceea2 (patch)
treeeb19131a90c0d817bde9ff6f12057092a6df6493 /meta/recipes-core/busybox/busybox_git.bb
parentee4061b43522c4893b41c3be63d06be1ee7e3c70 (diff)
downloadopenembedded-core-contrib-fa282186d82e8fe3c590d4ea79e464116e5ceea2.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 Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/busybox/busybox_git.bb')
-rw-r--r--meta/recipes-core/busybox/busybox_git.bb11
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 @@
require busybox.inc
-SRCREV = "e73f3c1d3d83699b723251f7e6a981021ce75475"
+SRCREV = "d9e0c438e10e2155513e5d26498af472c5137d65"
# Lookout for PV bump too when SRCREV is changed
-PV = "1.21.1+git${SRCPV}"
+PV = "1.22.1+git${SRCPV}"
S = "${WORKDIR}/git"
SRC_URI = "git://busybox.net/busybox.git \
file://get_header_tar.patch \
file://busybox-appletlib-dependency.patch \
- file://run-parts.in.usr-bin.patch \
- file://watch.in.usr-bin.patch \
file://busybox-udhcpc-no_deconfig.patch \
file://find-touchscreen.sh \
file://busybox-cron \
@@ -28,18 +26,13 @@ SRC_URI = "git://busybox.net/busybox.git \
file://mdev.conf \
file://umount.busybox \
file://defconfig \
- file://stat-usr-bin.patch \
file://busybox-syslog.service.in \
file://busybox-klogd.service.in \
- file://testsuite-du-du-k-works-fix-false-positive.patch \
file://fail_on_no_media.patch \
- file://busybox-sulogin-empty-root-password.patch \
file://run-ptest \
file://inetd.conf \
file://inetd \
file://login-utilities.cfg \
- file://busybox-list-suid-and-non-suid-app-configs.patch \
- file://busybox-sed-fix-sed-clusternewline-testcase.patch \
"
EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} SKIP_STRIP=y"