Signed-off-by: Oleksandr Kravchuk <open.sou...@oleksandr-kravchuk.com> --- .../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%)
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 deleted file mode 100644 index f9580b7d44..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2/0001-devlink.c-add-missing-include.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 5df629d825df4ccc4283228bc0739da126326072 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kana...@gmail.com> -Date: Sat, 6 Jun 2020 18:00:13 +0000 -Subject: [PATCH] devlink.c: add missing include - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kana...@gmail.com> ---- - 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" 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..60f31db9a2 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 @@ -From b7d96340c55afb7023ded0041107c63dbd886196 Mon Sep 17 00:00:00 2001 +From c6109138e9e13c7e40313aacc3ea582c52ffd61f Mon Sep 17 00:00:00 2001 From: Baruch Siach <bar...@tkos.co.il> 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 <bar...@tkos.co.il> Signed-off-by: Maxin B. John <maxin.j...@intel.com> + --- 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 - diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.7.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.8.0.bb similarity index 79% rename from meta/recipes-connectivity/iproute2/iproute2_5.7.0.bb rename to 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 \ file://0001-devlink.c-add-missing-include.patch \ " -SRC_URI[sha256sum] = "725dc7ba94aae54c6f8d4223ca055d9fb4fe89d6994b1c03bfb4411c4dd10f21" +SRC_URI[sha256sum] = "cfcd1f890290f8c8afcc91d9444ad929b9252c16f9ab3f286c50dd3c59dc646e" # CFLAGS are computed in Makefile and reference CCOPTS # -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#141394): https://lists.openembedded.org/g/openembedded-core/message/141394 Mute This Topic: https://lists.openembedded.org/mt/76138380/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-