summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChanghyeok Bae <changhyeok.bae@gmail.com>2020-08-19 13:52:09 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-20 15:30:07 +0100
commit56e6931c5051dd8d5b4a987061f2e7b1b30d311a (patch)
tree3ab6c2f0abc442931002e435007fef80988b85d3
parent660f5694ddfd892f168e6c6843ff9e1230153ab3 (diff)
downloadpoky-56e6931c5051dd8d5b4a987061f2e7b1b30d311a.tar.gz
iproute2: upgrade 5.7.0 -> 5.8.0
(From OE-Core rev: a38527357f4255f0f4cf888f640f38f2ef5942e0) Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/0001-devlink.c-add-missing-include.patch13
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch10
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2_5.8.0.bb (renamed from meta/recipes-connectivity/iproute2/iproute2_5.7.0.bb)2
3 files changed, 12 insertions, 13 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-devlink.c-add-missing-include.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-devlink.c-add-missing-include.patch
index f9580b7d44..fdd8bbfb3c 100644
--- a/meta/recipes-connectivity/iproute2/iproute2/0001-devlink.c-add-missing-include.patch
+++ b/meta/recipes-connectivity/iproute2/iproute2/0001-devlink.c-add-missing-include.patch
@@ -1,23 +1,24 @@
1From 5df629d825df4ccc4283228bc0739da126326072 Mon Sep 17 00:00:00 2001 1From ce39396d4617874323f6039a5b476e44bf552908 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Sat, 6 Jun 2020 18:00:13 +0000 3Date: Sat, 6 Jun 2020 18:00:13 +0000
4Subject: [PATCH] devlink.c: add missing include 4Subject: [PATCH] devlink.c: add missing include
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8
8--- 9---
9 devlink/devlink.c | 1 + 10 devlink/devlink.c | 1 +
10 1 file changed, 1 insertion(+) 11 1 file changed, 1 insertion(+)
11 12
12diff --git a/devlink/devlink.c b/devlink/devlink.c 13diff --git a/devlink/devlink.c b/devlink/devlink.c
13index 16602ab..c278e6d 100644 14index 0982fae..93dc01c 100644
14--- a/devlink/devlink.c 15--- a/devlink/devlink.c
15+++ b/devlink/devlink.c 16+++ b/devlink/devlink.c
16@@ -26,6 +26,7 @@ 17@@ -33,6 +33,7 @@
17 #include <libmnl/libmnl.h> 18 #include <sys/select.h>
18 #include <netinet/ether.h> 19 #include <sys/socket.h>
19 #include <sys/types.h> 20 #include <sys/types.h>
20+#include <signal.h> 21+#include <signal.h>
21 22
22 #include "SNAPSHOT.h" 23 #include "version.h"
23 #include "list.h" 24 #include "list.h"
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 50c4bfb0f2..74e3de1ce9 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
@@ -1,4 +1,4 @@
1From b7d96340c55afb7023ded0041107c63dbd886196 Mon Sep 17 00:00:00 2001 1From c25f8d1f7a6203dfeb10b39f80ffd314bb84a58d Mon Sep 17 00:00:00 2001
2From: Baruch Siach <baruch@tkos.co.il> 2From: Baruch Siach <baruch@tkos.co.il>
3Date: Thu, 22 Dec 2016 15:26:30 +0200 3Date: Thu, 22 Dec 2016 15:26:30 +0200
4Subject: [PATCH] libc-compat.h: add musl workaround 4Subject: [PATCH] libc-compat.h: add musl workaround
@@ -14,15 +14,16 @@ https://git.buildroot.net/buildroot/tree/package/iproute2/0001-Add-the-musl-work
14 14
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---
18 include/uapi/linux/libc-compat.h | 4 +++- 19 include/uapi/linux/libc-compat.h | 4 +++-
19 1 file changed, 3 insertions(+), 1 deletion(-) 20 1 file changed, 3 insertions(+), 1 deletion(-)
20 21
21diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h 22diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h
22index f38571d..30f0b67 100644 23index a159991..22198fa 100644
23--- a/include/uapi/linux/libc-compat.h 24--- a/include/uapi/linux/libc-compat.h
24+++ b/include/uapi/linux/libc-compat.h 25+++ b/include/uapi/linux/libc-compat.h
25@@ -49,10 +49,12 @@ 26@@ -50,10 +50,12 @@
26 #define _LIBC_COMPAT_H 27 #define _LIBC_COMPAT_H
27 28
28 /* We have included glibc headers... */ 29 /* We have included glibc headers... */
@@ -36,6 +37,3 @@ index f38571d..30f0b67 100644
36 37
37 /* GLIBC headers included first so don't define anything 38 /* GLIBC headers included first so don't define anything
38 * that would already be defined. */ 39 * that would already be defined. */
39--
402.4.0
41
diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.7.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.8.0.bb
index 276afeab11..3a590f9122 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_5.7.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_5.8.0.bb
@@ -5,7 +5,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
5 file://0001-devlink.c-add-missing-include.patch \ 5 file://0001-devlink.c-add-missing-include.patch \
6 " 6 "
7 7
8SRC_URI[sha256sum] = "725dc7ba94aae54c6f8d4223ca055d9fb4fe89d6994b1c03bfb4411c4dd10f21" 8SRC_URI[sha256sum] = "cfcd1f890290f8c8afcc91d9444ad929b9252c16f9ab3f286c50dd3c59dc646e"
9 9
10# CFLAGS are computed in Makefile and reference CCOPTS 10# CFLAGS are computed in Makefile and reference CCOPTS
11# 11#