From d633f99cbb4b72876953667b23076ade51c063f0 Mon Sep 17 00:00:00 2001 From: Changhyeok Bae Date: Thu, 14 Dec 2017 00:26:50 +0000 Subject: 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 Signed-off-by: Ross Burton --- meta/recipes-connectivity/iproute2/iproute2.inc | 2 +- .../iproute2/0001-libc-compat.h-add-musl-workaround.patch | 8 ++++---- meta/recipes-connectivity/iproute2/iproute2_4.13.0.bb | 15 --------------- meta/recipes-connectivity/iproute2/iproute2_4.14.1.bb | 15 +++++++++++++++ 4 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 meta/recipes-connectivity/iproute2/iproute2_4.13.0.bb create mode 100644 meta/recipes-connectivity/iproute2/iproute2_4.14.1.bb 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 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 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 Signed-off-by: Baruch Siach Signed-off-by: Maxin B. John --- - 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.13.0.bb deleted file mode 100644 index 32bf0d52f1..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2_4.13.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -require iproute2.inc - -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ - file://configure-cross.patch \ - file://0001-iproute2-de-bash-scripts.patch \ - file://0001-libc-compat.h-add-musl-workaround.patch \ - file://0001-ip-Remove-unneed-header.patch \ - " - -SRC_URI[md5sum] = "69dc9e3ece3296890278f0de478330c8" -SRC_URI[sha256sum] = "9cfb81edf8c8509e03daa77cf62aead01c4a827132f6c506578f94cc19415c50" - -# CFLAGS are computed in Makefile and reference CCOPTS -# -EXTRA_OEMAKE_append = " CCOPTS='${CFLAGS}'" diff --git a/meta/recipes-connectivity/iproute2/iproute2_4.14.1.bb b/meta/recipes-connectivity/iproute2/iproute2_4.14.1.bb new file mode 100644 index 0000000000..81e2e4a164 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2_4.14.1.bb @@ -0,0 +1,15 @@ +require iproute2.inc + +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ + file://configure-cross.patch \ + file://0001-iproute2-de-bash-scripts.patch \ + file://0001-libc-compat.h-add-musl-workaround.patch \ + file://0001-ip-Remove-unneed-header.patch \ + " + +SRC_URI[md5sum] = "1075423d7029e02a8f23ed4f42b7e372" +SRC_URI[sha256sum] = "d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067" + +# CFLAGS are computed in Makefile and reference CCOPTS +# +EXTRA_OEMAKE_append = " CCOPTS='${CFLAGS}'" -- cgit 1.2.3-korg