summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorChanghyeok Bae <changhyeok.bae@gmail.com>2017-12-14 00:26:50 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-19 12:18:04 +0000
commitd633f99cbb4b72876953667b23076ade51c063f0 (patch)
treefa2a8eb4b4d26004e3667bc8be50569522e32da7 /meta/recipes-connectivity
parentbacaa26decb8a1e3fa672e1923954793fde48766 (diff)
downloadopenembedded-core-contrib-d633f99cbb4b72876953667b23076ade51c063f0.tar.gz
iproute2: 4.13.0 -> 4.14.1
- This release features JSON output for many commands and greater support of offloading to hardware. - Config is changed to config.mk Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2.inc2
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch8
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2_4.14.1.bb (renamed from meta/recipes-connectivity/iproute2/iproute2_4.13.0.bb)4
3 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc
index a578eb3afaa..b404eedbfb1 100644
--- a/meta/recipes-connectivity/iproute2/iproute2.inc
+++ b/meta/recipes-connectivity/iproute2/iproute2.inc
@@ -21,7 +21,7 @@ EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/ipr
do_configure_append () {
sh configure ${STAGING_INCDIR}
# Explicitly disable ATM support
- sed -i -e '/TC_CONFIG_ATM/d' Config
+ sed -i -e '/TC_CONFIG_ATM/d' config.mk
}
do_install () {
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch
index 3d324c96daa..50c4bfb0f2a 100644
--- a/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch
+++ b/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch
@@ -15,13 +15,13 @@ https://git.buildroot.net/buildroot/tree/package/iproute2/0001-Add-the-musl-work
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
- include/linux/libc-compat.h | 4 +++-
+ include/uapi/linux/libc-compat.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
-diff --git a/include/linux/libc-compat.h b/include/linux/libc-compat.h
+diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h
index f38571d..30f0b67 100644
---- a/include/linux/libc-compat.h
-+++ b/include/linux/libc-compat.h
+--- a/include/uapi/linux/libc-compat.h
++++ b/include/uapi/linux/libc-compat.h
@@ -49,10 +49,12 @@
#define _LIBC_COMPAT_H
diff --git a/meta/recipes-connectivity/iproute2/iproute2_4.13.0.bb b/meta/recipes-connectivity/iproute2/iproute2_4.14.1.bb
index 32bf0d52f19..81e2e4a164b 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_4.13.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_4.14.1.bb
@@ -7,8 +7,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
file://0001-ip-Remove-unneed-header.patch \
"
-SRC_URI[md5sum] = "69dc9e3ece3296890278f0de478330c8"
-SRC_URI[sha256sum] = "9cfb81edf8c8509e03daa77cf62aead01c4a827132f6c506578f94cc19415c50"
+SRC_URI[md5sum] = "1075423d7029e02a8f23ed4f42b7e372"
+SRC_URI[sha256sum] = "d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067"
# CFLAGS are computed in Makefile and reference CCOPTS
#