summaryrefslogtreecommitdiffstats
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:37:14 +0000
commit01e10aa1d06f4750edb00e0a8a50e502957f0db7 (patch)
tree9f473d1b6bb57c54f6b9a01ce052212258d23315
parent66d783ca67e84adc8a1387fb7aaeb2039c480347 (diff)
downloadpoky-01e10aa1d06f4750edb00e0a8a50e502957f0db7.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 (From OE-Core rev: d633f99cbb4b72876953667b23076ade51c063f0) Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 a578eb3afa..b404eedbfb 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
21do_configure_append () { 21do_configure_append () {
22 sh configure ${STAGING_INCDIR} 22 sh configure ${STAGING_INCDIR}
23 # Explicitly disable ATM support 23 # Explicitly disable ATM support
24 sed -i -e '/TC_CONFIG_ATM/d' Config 24 sed -i -e '/TC_CONFIG_ATM/d' config.mk
25} 25}
26 26
27do_install () { 27do_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 3d324c96da..50c4bfb0f2 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
15Signed-off-by: Baruch Siach <baruch@tkos.co.il> 15Signed-off-by: Baruch Siach <baruch@tkos.co.il>
16Signed-off-by: Maxin B. John <maxin.john@intel.com> 16Signed-off-by: Maxin B. John <maxin.john@intel.com>
17--- 17---
18 include/linux/libc-compat.h | 4 +++- 18 include/uapi/linux/libc-compat.h | 4 +++-
19 1 file changed, 3 insertions(+), 1 deletion(-) 19 1 file changed, 3 insertions(+), 1 deletion(-)
20 20
21diff --git a/include/linux/libc-compat.h b/include/linux/libc-compat.h 21diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h
22index f38571d..30f0b67 100644 22index f38571d..30f0b67 100644
23--- a/include/linux/libc-compat.h 23--- a/include/uapi/linux/libc-compat.h
24+++ b/include/linux/libc-compat.h 24+++ b/include/uapi/linux/libc-compat.h
25@@ -49,10 +49,12 @@ 25@@ -49,10 +49,12 @@
26 #define _LIBC_COMPAT_H 26 #define _LIBC_COMPAT_H
27 27
diff --git a/meta/recipes-connectivity/iproute2/iproute2_4.13.0.bb b/meta/recipes-connectivity/iproute2/iproute2_4.14.1.bb
index 32bf0d52f1..81e2e4a164 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 \
7 file://0001-ip-Remove-unneed-header.patch \ 7 file://0001-ip-Remove-unneed-header.patch \
8 " 8 "
9 9
10SRC_URI[md5sum] = "69dc9e3ece3296890278f0de478330c8" 10SRC_URI[md5sum] = "1075423d7029e02a8f23ed4f42b7e372"
11SRC_URI[sha256sum] = "9cfb81edf8c8509e03daa77cf62aead01c4a827132f6c506578f94cc19415c50" 11SRC_URI[sha256sum] = "d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067"
12 12
13# CFLAGS are computed in Makefile and reference CCOPTS 13# CFLAGS are computed in Makefile and reference CCOPTS
14# 14#