iproute2: update to 5.8.0
PATCH 1/1 iproute2: update to 5.8.0
---
.../0001-devlink.c-add-missing-include.patch | 23 -------------------
...01-libc-compat.h-add-musl-workaround.patch | 10 ++++----
.../{iproute2_5.7.0.bb => iproute2_5.8.0.bb} | 2 +-
3 files changed, 5 insertions(+), 30 deletions(-)
delete mode 100644 meta/recipes-connectivity/iproute2/iproute2/0001-devlink.c-add-missing-include.patch
rename meta/recipes-connectivity/iproute2/{iproute2_5.7.0.bb => iproute2_5.8.0.bb} (79%)meta/recipes-connectivity/iproute2/iproute2/0001-devlink.c-add-missing-include.patch deleted +0 -23
@@ -1,23 +0,0 @@ -From 5df629d825df4ccc4283228bc0739da126326072 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Sat, 6 Jun 2020 18:00:13 +0000 -Subject: [PATCH] devlink.c: add missing include - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <[email protected]> ---- - devlink/devlink.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/devlink/devlink.c b/devlink/devlink.c -index 16602ab..c278e6d 100644 ---- a/devlink/devlink.c -+++ b/devlink/devlink.c -@@ -26,6 +26,7 @@ - #include <libmnl/libmnl.h> - #include <netinet/ether.h> - #include <sys/types.h> -+#include <signal.h> - - #include "SNAPSHOT.h" - #include "list.h"
meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch +4 -6
@@ -1,4 +1,4 @@ -From b7d96340c55afb7023ded0041107c63dbd886196 Mon Sep 17 00:00:00 2001 +From c6109138e9e13c7e40313aacc3ea582c52ffd61f Mon Sep 17 00:00:00 2001 From: Baruch Siach <[email protected]> Date: Thu, 22 Dec 2016 15:26:30 +0200 Subject: [PATCH] libc-compat.h: add musl workaround
@@ -14,15 +14,16 @@ https://git.buildroot.net/buildroot/tree/package/iproute2/0001-Add-the-musl-work Signed-off-by: Baruch Siach <[email protected]> Signed-off-by: Maxin B. John <[email protected]> + --- include/uapi/linux/libc-compat.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h -index f38571d..30f0b67 100644 +index a159991..22198fa 100644 --- a/include/uapi/linux/libc-compat.h +++ b/include/uapi/linux/libc-compat.h -@@ -49,10 +49,12 @@ +@@ -50,10 +50,12 @@ #define _LIBC_COMPAT_H /* We have included glibc headers... */
@@ -36,6 +37,3 @@ index f38571d..30f0b67 100644 /* GLIBC headers included first so don't define anything * that would already be defined. */ --- -2.4.0 -
meta/recipes-connectivity/iproute2/iproute2_5.8.0.bb renamed from meta/recipes-connectivity/iproute2/iproute2_5.7.0.bb +1 -1
@@ -5,7 +5,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://0001-devlink.c-add-missing-include.patch \ " -SRC_URI[sha256sum] = "725dc7ba94aae54c6f8d4223ca055d9fb4fe89d6994b1c03bfb4411c4dd10f21" +SRC_URI[sha256sum] = "cfcd1f890290f8c8afcc91d9444ad929b9252c16f9ab3f286c50dd3c59dc646e" # CFLAGS are computed in Makefile and reference CCOPTS #
Signature · 1 line
2.25.1
Quoted 82 lines · Oleksandr Kravchuk
Signed-off-by Oleksandr Kravchuk <[email protected]>--- .../0001-devlink.c-add-missing-include.patch | 23 ------------------- ...01-libc-compat.h-add-musl-workaround.patch | 10 ++++---- .../{iproute2_5.7.0.bb => iproute2_5.8.0.bb} | 2 +- 3 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 meta/recipes-connectivity/iproute2/iproute2/0001-devlink.c-add-missing-include.patch rename meta/recipes-connectivity/iproute2/{iproute2_5.7.0.bb => iproute2_5.8.0.bb} (79%)meta/recipes-connectivity/iproute2/iproute2/0001-devlink.c-add-missing-include.patch deleted +0
-23@@ -1,23 +0,0 @@ -From 5df629d825df4ccc4283228bc0739da126326072 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Sat, 6 Jun 2020 18:00:13 +0000 -Subject: [PATCH] devlink.c: add missing include - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <[email protected]> ---- - devlink/devlink.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/devlink/devlink.c b/devlink/devlink.c -index 16602ab..c278e6d 100644 ---- a/devlink/devlink.c -+++ b/devlink/devlink.c -@@ -26,6 +26,7 @@ - #include <libmnl/libmnl.h> - #include <netinet/ether.h> - #include <sys/types.h> -+#include <signal.h> - - #include "SNAPSHOT.h" - #include "list.h"meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch +4
-6@@ -1,4 +1,4 @@ -From b7d96340c55afb7023ded0041107c63dbd886196 Mon Sep 17 00:00:00 2001 +From c6109138e9e13c7e40313aacc3ea582c52ffd61f Mon Sep 17 00:00:00 2001 From: Baruch Siach <[email protected]> Date: Thu, 22 Dec 2016 15:26:30 +0200 Subject: [PATCH] libc-compat.h: add musl workaround@@ -14,15 +14,16 @@ https://git.buildroot.net/buildroot/tree/package/iproute2/0001-Add-the-musl-work Signed-off-by: Baruch Siach <[email protected]> Signed-off-by: Maxin B. John <[email protected]> + --- include/uapi/linux/libc-compat.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h -index f38571d..30f0b67 100644 +index a159991..22198fa 100644 --- a/include/uapi/linux/libc-compat.h +++ b/include/uapi/linux/libc-compat.h -@@ -49,10 +49,12 @@ +@@ -50,10 +50,12 @@ #define _LIBC_COMPAT_H /* We have included glibc headers... */@@ -36,6 +37,3 @@ index f38571d..30f0b67 100644 /* GLIBC headers included first so don't define anything * that would already be defined. */ --- -2.4.0 -meta/recipes-connectivity/iproute2/iproute2_5.8.0.bb renamed from meta/recipes-connectivity/iproute2/iproute2_5.7.0.bb +0
-0
meta/recipes-connectivity/iproute2/iproute2_5.8.0.bb SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ · line 6
Quoted 2 lines
meta/recipes-connectivity/iproute2/iproute2_5.8.0.bb renamed from meta/recipes-connectivity/iproute2/iproute2_5.7.0.bb +0
-0@@ -5,7 +5,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://0001-devlink.c-add-missing-include.patch \ "
The patch mentioned above in SRC_URI is deleted above?
Cheers,
Richard
Quoted 87 lines · Richard Purdie
Quoted 82 lines · Oleksandr Kravchuk
Signed-off-by Oleksandr Kravchuk <[email protected]>--- .../0001-devlink.c-add-missing-include.patch | 23 ------------------- ...01-libc-compat.h-add-musl-workaround.patch | 10 ++++---- .../{iproute2_5.7.0.bb => iproute2_5.8.0.bb} | 2 +- 3 files changed, 5 insertions(+), 30 deletions(-)delete mode 100644
meta/recipes-connectivity/iproute2/iproute2/0001-devlink.c-add-missing-include.patchrename meta/recipes-connectivity/iproute2/{iproute2_5.7.0.bb => iproute2_5.8.0.bb} (79%)meta/recipes-connectivity/iproute2/iproute2/0001-devlink.c-add-missing-include.patch deleted +0
-23@@ -1,23 +0,0 @@ -From 5df629d825df4ccc4283228bc0739da126326072 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Sat, 6 Jun 2020 18:00:13 +0000 -Subject: [PATCH] devlink.c: add missing include - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <[email protected]> ---- - devlink/devlink.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/devlink/devlink.c b/devlink/devlink.c -index 16602ab..c278e6d 100644 ---- a/devlink/devlink.c -+++ b/devlink/devlink.c -@@ -26,6 +26,7 @@ - #include <libmnl/libmnl.h> - #include <netinet/ether.h> - #include <sys/types.h> -+#include <signal.h> - - #include "SNAPSHOT.h" - #include "list.h"meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch +4
-6@@ -1,4 +1,4 @@ -From b7d96340c55afb7023ded0041107c63dbd886196 Mon Sep 17 00:00:00 2001 +From c6109138e9e13c7e40313aacc3ea582c52ffd61f Mon Sep 17 00:00:00 2001 From: Baruch Siach <[email protected]> Date: Thu, 22 Dec 2016 15:26:30 +0200 Subject: [PATCH] libc-compat.h: add musl workaround@@ -14,15 +14,16 @@ https://git.buildroot.net/buildroot/tree/package/iproute2/0001-Add-the-musl-work Signed-off-by: Baruch Siach <[email protected]> Signed-off-by: Maxin B. John <[email protected]> + --- include/uapi/linux/libc-compat.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h -index f38571d..30f0b67 100644 +index a159991..22198fa 100644 --- a/include/uapi/linux/libc-compat.h +++ b/include/uapi/linux/libc-compat.h -@@ -49,10 +49,12 @@ +@@ -50,10 +50,12 @@ #define _LIBC_COMPAT_H /* We have included glibc headers... */@@ -36,6 +37,3 @@ index f38571d..30f0b67 100644 /* GLIBC headers included first so don't define anything * that would already be defined. */ --- -2.4.0 -meta/recipes-connectivity/iproute2/iproute2_5.8.0.bb renamed from meta/recipes-connectivity/iproute2/iproute2_5.7.0.bb +0
-0meta/recipes-connectivity/iproute2/iproute2_5.8.0.bb SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ · line 6
Quoted 2 lines
meta/recipes-connectivity/iproute2/iproute2_5.8.0.bb renamed from meta/recipes-connectivity/iproute2/iproute2_5.7.0.bb +0
-0@@ -5,7 +5,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://0001-devlink.c-add-missing-include.patch \ "The patch mentioned above in
SRC_URIis deleted above?
Quoted 3 lines
Cheers,
Richard
Yes, it was a backport. It is part of this release.
Quoted 113 lines
-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Oleksandr Kravchuk
Sent: den 12 augusti 2020 17:17
To: Richard Purdie <[email protected]>; openembedded- [email protected]
Subject: Re: [OE-core] [PATCH] iproute2: update to 5.8.0Quoted 4 lines · Richard Purdie
Quoted 3 lines · Oleksandr Kravchuk
Signed-off-by Oleksandr Kravchuk <[email protected]>--- .../0001-devlink.c-add-missing-include.patch | 23 -------------------
Quoted 4 lines
Quoted 4 lines
...01-libc-compat.h-add-musl-workaround.patch | 10 ++++---- .../{iproute2_5.7.0.bb => iproute2_5.8.0.bb} | 2 +- 3 files changed, 5 insertions(+), 30 deletions(-)delete mode 100644 meta/recipes-connectivity/iproute2/iproute2/0001-
devlink.c-add-missing-include.patch
Quoted 1 line
Quoted 1 line
rename meta/recipes-connectivity/iproute2/{iproute2_5.7.0.bb =>
iproute2_5.8.0.bb} (79%)
Quoted 2 lines
Review
Quoted 2 lines
(quoted diff) +0
-0devlink.c-add-missing-include.patch b/meta/recipes-
connectivity/iproute2/iproute2/0001-devlink.c-add-missing-include.patchQuoted 3 lines
Quoted 3 lines
deleted file mode 100644
index f9580b7d44..0000000000
--- a/meta/recipes-connectivity/iproute2/iproute2/0001-devlink.c-add-missing-include.patch
Quoted 3 lines
Review line 1
Quoted 3 lines
+++
/dev/null(quoted diff) +0
-1@@ -1,23 +0,0 @@ -From 5df629d825df4ccc4283228bc0739da126326072 Mon Sep 17 00:00:002001
Quoted 15 lines
Quoted 15 lines
meta/recipes-connectivity/iproute2/iproute2/0001-devlink.c-add-missing-include.patch deleted +0
-15-From: Alexander Kanavin <[email protected]> -Date: Sat, 6 Jun 2020 18:00:13 +0000 -Subject: [PATCH] devlink.c: add missing include - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <[email protected]> ---- - devlink/devlink.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/devlink/devlink.c b/devlink/devlink.c -index 16602ab..c278e6d 100644 ---- a/devlink/devlink.c -+++ b/devlink/devlink.c -@@ -26,6 +26,7 @@Quoted 8 lines
Review
Quoted 8 lines
meta/recipes-connectivity/iproute2/iproute2/0001-devlink.c-add-missing-include.patch deleted +0
-7- #include <libmnl/libmnl.h> - #include <netinet/ether.h> - #include <sys/types.h> -+#include <signal.h> - - #include "SNAPSHOT.h" - #include "list.h"(quoted diff) +0
-0compat.h-add-musl-workaround.patch b/meta/recipes- connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl- workaround.patch
Quoted 2 lines
Quoted 2 lines
index
50c4bfb0f2..60f31db9a2100644
--- a/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch
Quoted 1 line
Quoted 1 line
+++ b/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-
add-musl-workaround.patch
Quoted 2 lines
Review line 1
Quoted 2 lines
(quoted diff) +0
-1@@ -1,4 +1,4 @@ -From b7d96340c55afb7023ded0041107c63dbd886196 Mon Sep 17 00:00:002001
Quoted 1 line
Review line 1
Quoted 1 line
(quoted diff) +1
-0+From c6109138e9e13c7e40313aacc3ea582c52ffd61f Mon Sep 17 00:00:002001
Quoted 4 lines
meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch
Quoted 4 lines
meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch +0
-0From: Baruch Siach <[email protected]> Date: Thu, 22 Dec 2016 15:26:30 +0200 Subject: [PATCH] libc-compat.h: add musl workaround@@ -14,15 +14,16 @@https://git.buildroot.net/buildroot/tree/package/iproute2/0001-Add-the-
musl-workQuoted 9 lines
meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch https://git.buildroot.net/buildroot/tree/package/iproute2/0001-Add-the-musl-work
Quoted 9 lines
meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch +1
-0Signed-off-by: Baruch Siach <[email protected]> Signed-off-by: Maxin B. John <[email protected]> + --- include/uapi/linux/libc-compat.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/libc-compat.h
b/include/uapi/linux/libc-compat.hQuoted 28 lines
Quoted 24 lines
meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch +2
-5-index f38571d..30f0b67 100644 +index a159991..22198fa 100644 --- a/include/uapi/linux/libc-compat.h +++ b/include/uapi/linux/libc-compat.h -@@ -49,10 +49,12 @@ +@@ -50,10 +50,12 @@ #define _LIBC_COMPAT_H /* We have included glibc headers... */@@ -36,6 +37,3 @@ index f38571d..30f0b67 100644 /* GLIBC headers included first so don't define anything * that would already be defined. */ --- -2.4.0 -meta/recipes-connectivity/iproute2/iproute2_5.8.0.bb renamed from meta/recipes-connectivity/iproute2/iproute2_5.7.0.bb +0
-0meta/recipes-connectivity/iproute2/iproute2_5.8.0.bb SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ · line 6
Quoted 2 lines
meta/recipes-connectivity/iproute2/iproute2_5.8.0.bb renamed from meta/recipes-connectivity/iproute2/iproute2_5.7.0.bb +0
-0@@ -5,7 +5,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://0001-devlink.c-add-missing-include.patch \ "The patch mentioned above in
SRC_URIis deleted above?
Quoted 5 lines
Quoted 3 lines
Cheers,
Richard
Yes, it was a backport. It is part of this release.
Since the patch has been deleted, you also need to remove it from the SRC_URI or there will be a build failure. It is also a good idea to mention why it is removed in the commit message.
//Peter