aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox/busybox_git.bb
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2016-12-22 16:37:00 +0800
committerChen Qi <Qi.Chen@windriver.com>2017-01-03 16:45:12 +0800
commit0615a5dfe258d66aee2b41a980536bbffe6874de (patch)
tree45b4020569a6f7e0812d9a511d36478b0b65e86f /meta/recipes-core/busybox/busybox_git.bb
parent425afe2484707640ac71194885fdb263e95e9950 (diff)
downloadopenembedded-core-contrib-0615a5dfe258d66aee2b41a980536bbffe6874de.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_git.bb')
-rw-r--r--meta/recipes-core/busybox/busybox_git.bb7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-core/busybox/busybox_git.bb b/meta/recipes-core/busybox/busybox_git.bb
index c2ee3e6c4b..d10fbf7de7 100644
--- a/meta/recipes-core/busybox/busybox_git.bb
+++ b/meta/recipes-core/busybox/busybox_git.bb
@@ -1,8 +1,8 @@
require busybox.inc
-SRCREV = "1b7c17391de66502dd7a97c866e0a33681edbb1f"
+SRCREV = "868530ade244bf8162fb6a10816bd815b166d509"
# Lookout for PV bump too when SRCREV is changed
-PV = "1.25.0+git${SRCPV}"
+PV = "1.25.1+git${SRCPV}"
S = "${WORKDIR}/git"
@@ -33,7 +33,6 @@ SRC_URI = "git://busybox.net/busybox.git \
file://inetd \
file://login-utilities.cfg \
file://recognize_connmand.patch \
- file://busybox-cross-menuconfig.patch \
file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \
file://mount-via-label.cfg \
file://sha1sum.cfg \
@@ -46,6 +45,8 @@ SRC_URI = "git://busybox.net/busybox.git \
file://rcS \
file://rcK \
file://runlevel \
+ file://makefile-libbb-race.patch \
+ file://0001-libiproute-handle-table-ids-larger-than-255.patch \
"
SRC_URI_append_libc-musl = " file://musl.cfg "