summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2016-05-23 18:39:55 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-25 07:50:17 +0100
commit9ade84b57e03e8f7731e031d287593d1b773b640 (patch)
treea79158edcfb7ea2dd55c6c9cea586738d5ed1e00
parent44e4d20a6f64822c4d4288dab17a28397e20d60c (diff)
downloadpoky-9ade84b57e03e8f7731e031d287593d1b773b640.tar.gz
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 <maxin.john@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2.inc2
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch45
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2_4.6.0.bb (renamed from meta/recipes-connectivity/iproute2/iproute2_4.5.0.bb)4
3 files changed, 31 insertions, 20 deletions
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 \
11 11
12DEPENDS = "flex-native bison-native iptables elfutils" 12DEPENDS = "flex-native bison-native iptables elfutils"
13 13
14inherit update-alternatives 14inherit update-alternatives bash-completion
15 15
16EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" 16EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'"
17 17
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 <netinet/in.h>.
9Original patch taken from 9Original patch taken from
10http://git.alpinelinux.org/cgit/aports/tree/main/iproute2/musl-fixes.patch. 10http://git.alpinelinux.org/cgit/aports/tree/main/iproute2/musl-fixes.patch.
11 11
12(Refreshed the patch for 4.5 release) 12(Refreshed the patch for 4.6 release)
13 13
14Upstream-Status: Pending 14Upstream-Status: Pending
15 15
16Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 16Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
17Signed-off-by: Maxin B. John <maxin.john@intel.com> 17Signed-off-by: Maxin B. John <maxin.john@intel.com>
18--- 18----
19diff -Naur iproute2-4.5.0-orig/include/libiptc/ipt_kernel_headers.h iproute2-4.5.0/include/libiptc/ipt_kernel_headers.h 19diff -Naur iproute2-4.6.0-orig/include/libiptc/ipt_kernel_headers.h iproute2-4.6.0/include/libiptc/ipt_kernel_headers.h
20--- iproute2-4.5.0-orig/include/libiptc/ipt_kernel_headers.h 2016-03-15 01:02:31.000000000 +0200 20--- iproute2-4.6.0-orig/include/libiptc/ipt_kernel_headers.h 2016-05-23 12:03:23.821826910 +0300
21+++ iproute2-4.5.0/include/libiptc/ipt_kernel_headers.h 2016-03-23 18:33:38.579062567 +0200 21+++ iproute2-4.6.0/include/libiptc/ipt_kernel_headers.h 2016-05-23 12:04:23.714078154 +0300
22@@ -6,7 +6,6 @@ 22@@ -6,7 +6,6 @@
23 #include <limits.h> 23 #include <limits.h>
24 24
@@ -27,9 +27,9 @@ diff -Naur iproute2-4.5.0-orig/include/libiptc/ipt_kernel_headers.h iproute2-4.5
27 #include <netinet/ip_icmp.h> 27 #include <netinet/ip_icmp.h>
28 #include <netinet/tcp.h> 28 #include <netinet/tcp.h>
29 #include <netinet/udp.h> 29 #include <netinet/udp.h>
30diff -Naur iproute2-4.5.0-orig/include/linux/if_bridge.h iproute2-4.5.0/include/linux/if_bridge.h 30diff -Naur iproute2-4.6.0-orig/include/linux/if_bridge.h iproute2-4.6.0/include/linux/if_bridge.h
31--- iproute2-4.5.0-orig/include/linux/if_bridge.h 2016-03-15 01:02:31.000000000 +0200 31--- iproute2-4.6.0-orig/include/linux/if_bridge.h 2016-05-23 12:03:23.821826910 +0300
32+++ iproute2-4.5.0/include/linux/if_bridge.h 2016-03-23 18:33:58.569812648 +0200 32+++ iproute2-4.6.0/include/linux/if_bridge.h 2016-05-23 12:04:23.716078129 +0300
33@@ -15,7 +15,6 @@ 33@@ -15,7 +15,6 @@
34 34
35 #include <linux/types.h> 35 #include <linux/types.h>
@@ -38,9 +38,9 @@ diff -Naur iproute2-4.5.0-orig/include/linux/if_bridge.h iproute2-4.5.0/include/
38 38
39 #define SYSFS_BRIDGE_ATTR "bridge" 39 #define SYSFS_BRIDGE_ATTR "bridge"
40 #define SYSFS_BRIDGE_FDB "brforward" 40 #define SYSFS_BRIDGE_FDB "brforward"
41diff -Naur iproute2-4.5.0-orig/include/linux/netfilter.h iproute2-4.5.0/include/linux/netfilter.h 41diff -Naur iproute2-4.6.0-orig/include/linux/netfilter.h iproute2-4.6.0/include/linux/netfilter.h
42--- iproute2-4.5.0-orig/include/linux/netfilter.h 2016-03-15 01:02:31.000000000 +0200 42--- iproute2-4.6.0-orig/include/linux/netfilter.h 2016-05-23 12:03:23.821826910 +0300
43+++ iproute2-4.5.0/include/linux/netfilter.h 2016-03-23 18:34:38.138317974 +0200 43+++ iproute2-4.6.0/include/linux/netfilter.h 2016-05-23 12:04:23.717078117 +0300
44@@ -4,8 +4,6 @@ 44@@ -4,8 +4,6 @@
45 #include <linux/types.h> 45 #include <linux/types.h>
46 46
@@ -50,9 +50,20 @@ diff -Naur iproute2-4.5.0-orig/include/linux/netfilter.h iproute2-4.5.0/include/
50 50
51 /* Responses from hook functions. */ 51 /* Responses from hook functions. */
52 #define NF_DROP 0 52 #define NF_DROP 0
53diff -Naur iproute2-4.5.0-orig/include/linux/xfrm.h iproute2-4.5.0/include/linux/xfrm.h 53diff -Naur iproute2-4.6.0-orig/include/linux/netfilter_ipv4/ip_tables.h iproute2-4.6.0/include/linux/netfilter_ipv4/ip_tables.h
54--- iproute2-4.5.0-orig/include/linux/xfrm.h 2016-03-15 01:02:31.000000000 +0200 54--- iproute2-4.6.0-orig/include/linux/netfilter_ipv4/ip_tables.h 2016-05-18 21:56:02.000000000 +0300
55+++ iproute2-4.5.0/include/linux/xfrm.h 2016-03-23 18:34:57.539075431 +0200 55+++ iproute2-4.6.0/include/linux/netfilter_ipv4/ip_tables.h 2016-05-23 12:09:22.888337961 +0300
56@@ -17,7 +17,6 @@
57
58 #include <linux/types.h>
59
60-#include <linux/if.h>
61 #include <linux/netfilter_ipv4.h>
62
63 #include <linux/netfilter/x_tables.h>
64diff -Naur iproute2-4.6.0-orig/include/linux/xfrm.h iproute2-4.6.0/include/linux/xfrm.h
65--- iproute2-4.6.0-orig/include/linux/xfrm.h 2016-05-23 12:03:23.821826910 +0300
66+++ iproute2-4.6.0/include/linux/xfrm.h 2016-05-23 12:04:23.718078104 +0300
56@@ -1,7 +1,6 @@ 67@@ -1,7 +1,6 @@
57 #ifndef _LINUX_XFRM_H 68 #ifndef _LINUX_XFRM_H
58 #define _LINUX_XFRM_H 69 #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
61 #include <linux/types.h> 72 #include <linux/types.h>
62 73
63 /* All of the structures in this file may not change size as they are 74 /* All of the structures in this file may not change size as they are
64diff -Naur iproute2-4.5.0-orig/include/utils.h iproute2-4.5.0/include/utils.h 75diff -Naur iproute2-4.6.0-orig/include/utils.h iproute2-4.6.0/include/utils.h
65--- iproute2-4.5.0-orig/include/utils.h 2016-03-15 01:02:31.000000000 +0200 76--- iproute2-4.6.0-orig/include/utils.h 2016-05-23 12:03:23.821826910 +0300
66+++ iproute2-4.5.0/include/utils.h 2016-03-23 18:35:50.066418749 +0200 77+++ iproute2-4.6.0/include/utils.h 2016-05-23 12:04:23.718078104 +0300
67@@ -1,6 +1,7 @@ 78@@ -1,6 +1,7 @@
68 #ifndef __UTILS_H__ 79 #ifndef __UTILS_H__
69 #define __UTILS_H__ 1 80 #define __UTILS_H__ 1
diff --git a/meta/recipes-connectivity/iproute2/iproute2_4.5.0.bb b/meta/recipes-connectivity/iproute2/iproute2_4.6.0.bb
index c047446dca..49719376f6 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_4.5.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_4.6.0.bb
@@ -5,8 +5,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
5 file://0001-iproute2-de-bash-scripts.patch \ 5 file://0001-iproute2-de-bash-scripts.patch \
6 file://iproute2-4.3.0-musl.patch \ 6 file://iproute2-4.3.0-musl.patch \
7 " 7 "
8SRC_URI[md5sum] = "b9ee1cbba7e20e04dfdd4b3055181955" 8SRC_URI[md5sum] = "d015e437e4f744d51d3a1a53341826d5"
9SRC_URI[sha256sum] = "3f15292f53e465cb5bd6652961343ca64eb6936309ae75be5d5a541435bc494a" 9SRC_URI[sha256sum] = "74fc6a8ad085be095a159f8158bbaf385b42af9e101619f233f1ae466829d406"
10 10
11# CFLAGS are computed in Makefile and reference CCOPTS 11# CFLAGS are computed in Makefile and reference CCOPTS
12# 12#
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-02-26 17:27:28 +0000