From 9ade84b57e03e8f7731e031d287593d1b773b640 Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Mon, 23 May 2016 18:39:55 +0300 Subject: iproute2: upgrade to 4.6.0 1. Refreshed musl build fix patch for 4.6.0 2. Use the bash-completion class to package the completion files. (From OE-Core rev: d3d4bb2d467039d30f372e814e216377dab1057b) Signed-off-by: Maxin B. John Signed-off-by: Richard Purdie --- meta/recipes-connectivity/iproute2/iproute2.inc | 2 +- .../iproute2/iproute2/iproute2-4.3.0-musl.patch | 45 ++++++++++++++-------- .../iproute2/iproute2_4.5.0.bb | 13 ------- .../iproute2/iproute2_4.6.0.bb | 13 +++++++ 4 files changed, 42 insertions(+), 31 deletions(-) delete mode 100644 meta/recipes-connectivity/iproute2/iproute2_4.5.0.bb create mode 100644 meta/recipes-connectivity/iproute2/iproute2_4.6.0.bb (limited to 'meta/recipes-connectivity') diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc index 86e9310631..63e7ca9e83 100644 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/meta/recipes-connectivity/iproute2/iproute2.inc @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ DEPENDS = "flex-native bison-native iptables elfutils" -inherit update-alternatives +inherit update-alternatives bash-completion EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" diff --git a/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch b/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch index bbe0242a23..8c078f69d0 100644 --- a/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch +++ b/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch @@ -9,16 +9,16 @@ In order to fix this, use just the C library header . Original patch taken from http://git.alpinelinux.org/cgit/aports/tree/main/iproute2/musl-fixes.patch. -(Refreshed the patch for 4.5 release) +(Refreshed the patch for 4.6 release) Upstream-Status: Pending Signed-off-by: Thomas Petazzoni Signed-off-by: Maxin B. John ---- -diff -Naur iproute2-4.5.0-orig/include/libiptc/ipt_kernel_headers.h iproute2-4.5.0/include/libiptc/ipt_kernel_headers.h ---- iproute2-4.5.0-orig/include/libiptc/ipt_kernel_headers.h 2016-03-15 01:02:31.000000000 +0200 -+++ iproute2-4.5.0/include/libiptc/ipt_kernel_headers.h 2016-03-23 18:33:38.579062567 +0200 +---- +diff -Naur iproute2-4.6.0-orig/include/libiptc/ipt_kernel_headers.h iproute2-4.6.0/include/libiptc/ipt_kernel_headers.h +--- iproute2-4.6.0-orig/include/libiptc/ipt_kernel_headers.h 2016-05-23 12:03:23.821826910 +0300 ++++ iproute2-4.6.0/include/libiptc/ipt_kernel_headers.h 2016-05-23 12:04:23.714078154 +0300 @@ -6,7 +6,6 @@ #include @@ -27,9 +27,9 @@ diff -Naur iproute2-4.5.0-orig/include/libiptc/ipt_kernel_headers.h iproute2-4.5 #include #include #include -diff -Naur iproute2-4.5.0-orig/include/linux/if_bridge.h iproute2-4.5.0/include/linux/if_bridge.h ---- iproute2-4.5.0-orig/include/linux/if_bridge.h 2016-03-15 01:02:31.000000000 +0200 -+++ iproute2-4.5.0/include/linux/if_bridge.h 2016-03-23 18:33:58.569812648 +0200 +diff -Naur iproute2-4.6.0-orig/include/linux/if_bridge.h iproute2-4.6.0/include/linux/if_bridge.h +--- iproute2-4.6.0-orig/include/linux/if_bridge.h 2016-05-23 12:03:23.821826910 +0300 ++++ iproute2-4.6.0/include/linux/if_bridge.h 2016-05-23 12:04:23.716078129 +0300 @@ -15,7 +15,6 @@ #include @@ -38,9 +38,9 @@ diff -Naur iproute2-4.5.0-orig/include/linux/if_bridge.h iproute2-4.5.0/include/ #define SYSFS_BRIDGE_ATTR "bridge" #define SYSFS_BRIDGE_FDB "brforward" -diff -Naur iproute2-4.5.0-orig/include/linux/netfilter.h iproute2-4.5.0/include/linux/netfilter.h ---- iproute2-4.5.0-orig/include/linux/netfilter.h 2016-03-15 01:02:31.000000000 +0200 -+++ iproute2-4.5.0/include/linux/netfilter.h 2016-03-23 18:34:38.138317974 +0200 +diff -Naur iproute2-4.6.0-orig/include/linux/netfilter.h iproute2-4.6.0/include/linux/netfilter.h +--- iproute2-4.6.0-orig/include/linux/netfilter.h 2016-05-23 12:03:23.821826910 +0300 ++++ iproute2-4.6.0/include/linux/netfilter.h 2016-05-23 12:04:23.717078117 +0300 @@ -4,8 +4,6 @@ #include @@ -50,9 +50,20 @@ diff -Naur iproute2-4.5.0-orig/include/linux/netfilter.h iproute2-4.5.0/include/ /* Responses from hook functions. */ #define NF_DROP 0 -diff -Naur iproute2-4.5.0-orig/include/linux/xfrm.h iproute2-4.5.0/include/linux/xfrm.h ---- iproute2-4.5.0-orig/include/linux/xfrm.h 2016-03-15 01:02:31.000000000 +0200 -+++ iproute2-4.5.0/include/linux/xfrm.h 2016-03-23 18:34:57.539075431 +0200 +diff -Naur iproute2-4.6.0-orig/include/linux/netfilter_ipv4/ip_tables.h iproute2-4.6.0/include/linux/netfilter_ipv4/ip_tables.h +--- iproute2-4.6.0-orig/include/linux/netfilter_ipv4/ip_tables.h 2016-05-18 21:56:02.000000000 +0300 ++++ iproute2-4.6.0/include/linux/netfilter_ipv4/ip_tables.h 2016-05-23 12:09:22.888337961 +0300 +@@ -17,7 +17,6 @@ + + #include + +-#include + #include + + #include +diff -Naur iproute2-4.6.0-orig/include/linux/xfrm.h iproute2-4.6.0/include/linux/xfrm.h +--- iproute2-4.6.0-orig/include/linux/xfrm.h 2016-05-23 12:03:23.821826910 +0300 ++++ iproute2-4.6.0/include/linux/xfrm.h 2016-05-23 12:04:23.718078104 +0300 @@ -1,7 +1,6 @@ #ifndef _LINUX_XFRM_H #define _LINUX_XFRM_H @@ -61,9 +72,9 @@ diff -Naur iproute2-4.5.0-orig/include/linux/xfrm.h iproute2-4.5.0/include/linux #include /* All of the structures in this file may not change size as they are -diff -Naur iproute2-4.5.0-orig/include/utils.h iproute2-4.5.0/include/utils.h ---- iproute2-4.5.0-orig/include/utils.h 2016-03-15 01:02:31.000000000 +0200 -+++ iproute2-4.5.0/include/utils.h 2016-03-23 18:35:50.066418749 +0200 +diff -Naur iproute2-4.6.0-orig/include/utils.h iproute2-4.6.0/include/utils.h +--- iproute2-4.6.0-orig/include/utils.h 2016-05-23 12:03:23.821826910 +0300 ++++ iproute2-4.6.0/include/utils.h 2016-05-23 12:04:23.718078104 +0300 @@ -1,6 +1,7 @@ #ifndef __UTILS_H__ #define __UTILS_H__ 1 diff --git a/meta/recipes-connectivity/iproute2/iproute2_4.5.0.bb b/meta/recipes-connectivity/iproute2/iproute2_4.5.0.bb deleted file mode 100644 index c047446dca..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2_4.5.0.bb +++ /dev/null @@ -1,13 +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://iproute2-4.3.0-musl.patch \ - " -SRC_URI[md5sum] = "b9ee1cbba7e20e04dfdd4b3055181955" -SRC_URI[sha256sum] = "3f15292f53e465cb5bd6652961343ca64eb6936309ae75be5d5a541435bc494a" - -# CFLAGS are computed in Makefile and reference CCOPTS -# -EXTRA_OEMAKE_append = " CCOPTS='${CFLAGS}'" diff --git a/meta/recipes-connectivity/iproute2/iproute2_4.6.0.bb b/meta/recipes-connectivity/iproute2/iproute2_4.6.0.bb new file mode 100644 index 0000000000..49719376f6 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2_4.6.0.bb @@ -0,0 +1,13 @@ +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://iproute2-4.3.0-musl.patch \ + " +SRC_URI[md5sum] = "d015e437e4f744d51d3a1a53341826d5" +SRC_URI[sha256sum] = "74fc6a8ad085be095a159f8158bbaf385b42af9e101619f233f1ae466829d406" + +# CFLAGS are computed in Makefile and reference CCOPTS +# +EXTRA_OEMAKE_append = " CCOPTS='${CFLAGS}'" -- cgit 1.2.3-korg