iproute2: update 5.15.0 to 5.16.0
PATCH 1/1 iproute2: update 5.15.0 to 5.16.0
0001-lib-fix-ax25.h-include-for-musl.patch is the fix for musl and comes from upstream.
---
...0001-lib-fix-ax25.h-include-for-musl.patch | 37 +++++++++++++++++++
...{iproute2_5.15.0.bb => iproute2_5.16.0.bb} | 3 +-
2 files changed, 39 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch
rename meta/recipes-connectivity/iproute2/{iproute2_5.15.0.bb => iproute2_5.16.0.bb} (64%)meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch new file +37 -0
@@ -0,0 +1,37 @@ +From 8bced38a941a181f1468fa39541e872e51b6022f Mon Sep 17 00:00:00 2001 +From: Sam James <[email protected]> +Date: Thu, 13 Jan 2022 08:14:13 +0000 +Subject: [PATCH] lib: fix ax25.h include for musl + +ax25.h isn't guaranteed to be avilable in netax25/*; +it's dependent on our choice of libc (it's not available +on musl at least) [0]. + +Let's use the version from linux-headers. + +[0] https://sourceware.org/glibc/wiki/Synchronizing_Headers +Bug: https://bugs.gentoo.org/831102 + +Signed-off-by: Sam James <[email protected]> +Signed-off-by: Stephen Hemminger <[email protected]> + +Upstream-Status: Backport +--- + lib/ax25_ntop.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/ax25_ntop.c b/lib/ax25_ntop.c +index cfd0e04b..3a72a43e 100644 +--- a/lib/ax25_ntop.c ++++ b/lib/ax25_ntop.c +@@ -2,7 +2,7 @@ + + #include <errno.h> + #include <sys/socket.h> +-#include <netax25/ax25.h> ++#include <linux/ax25.h> + + #include "utils.h" + +-- +2.32.0 (Apple Git-132)
meta/recipes-connectivity/iproute2/iproute2_5.16.0.bb renamed from meta/recipes-connectivity/iproute2/iproute2_5.15.0.bb +2 -1
@@ -2,9 +2,10 @@ require iproute2.inc SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://0001-libc-compat.h-add-musl-workaround.patch \ + file://0001-lib-fix-ax25.h-include-for-musl.patch \ " -SRC_URI[sha256sum] = "38e3e4a5f9a7f5575c015027a10df097c149111eeb739993128e5b2b35b291ff" +SRC_URI[sha256sum] = "c064b66f6b001c2a35aa5224b5b1ac8aa4bee104d7dce30d6f10a84cb8b01e2f" # CFLAGS are computed in Makefile and reference CCOPTS #
Signature · 1 line
2.17.1
Quoted 26 lines · Changhyeok Bae
0001-lib-fix-ax25.h-include-for-musl.patch is the fix for musl and comes from upstream.
Signed-off-by Changhyeok Bae <[email protected]>--- ...0001-lib-fix-ax25.h-include-for-musl.patch | 37 +++++++++++++++++++ ...{iproute2_5.15.0.bb => iproute2_5.16.0.bb} | 3 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch rename meta/recipes-connectivity/iproute2/{iproute2_5.15.0.bb => iproute2_5.16.0.bb} (64%)meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch new file +8
-0@@ -0,0 +1,37 @@ +From 8bced38a941a181f1468fa39541e872e51b6022f Mon Sep 17 00:00:00 2001 +From: Sam James <[email protected]> +Date: Thu, 13 Jan 2022 08:14:13 +0000 +Subject: [PATCH] lib: fix ax25.h include for musl + +ax25.h isn't guaranteed to be avilable in netax25/*; +it's dependent on our choice of libc (it's not available +on musl at least) [0].
meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch line 18
Quoted 10 lines
meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch new file +10
-0+ +Let's use the version from linux-headers. + +[0] https://sourceware.org/glibc/wiki/Synchronizing_Headers +Bug: https://bugs.gentoo.org/831102 + +Signed-off-by: Sam James <[email protected]> +Signed-off-by: Stephen Hemminger <[email protected]> + +Upstream-Status: Backport
please mention https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=8bced38a941a181f1468fa39541e872e51b6022f
here to point to backport link from upstream
Quoted 50 lines
meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch new file +19
-0+--- + lib/ax25_ntop.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/ax25_ntop.c b/lib/ax25_ntop.c +index cfd0e04b..3a72a43e 100644 +--- a/lib/ax25_ntop.c ++++ b/lib/ax25_ntop.c +@@ -2,7 +2,7 @@ + + #include <errno.h> + #include <sys/socket.h> +-#include <netax25/ax25.h> ++#include <linux/ax25.h> + + #include "utils.h" + +-- +2.32.0 (Apple Git-132)meta/recipes-connectivity/iproute2/iproute2_5.16.0.bb renamed from meta/recipes-connectivity/iproute2/iproute2_5.15.0.bb +2
-2@@ -2,9 +2,10 @@ require iproute2.inc SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://0001-libc-compat.h-add-musl-workaround.patch \ + file://0001-lib-fix-ax25.h-include-for-musl.patch \ " -SRC_URI[sha256sum] = "38e3e4a5f9a7f5575c015027a10df097c149111eeb739993128e5b2b35b291ff" +SRC_URI[sha256sum] = "c064b66f6b001c2a35aa5224b5b1ac8aa4bee104d7dce30d6f10a84cb8b01e2f" # CFLAGS are computed in Makefile and reference CCOPTS # --2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#160668): https://lists.openembedded.org/g/openembedded-core/message/160668
Mute This Topic: https://lists.openembedded.org/mt/88500407/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Quoted 32 lines · Khem Raj
Quoted 31 lines · Changhyeok Bae
0001-lib-fix-ax25.h-include-for-musl.patch is the fix for musl and comes from upstream.
Signed-off-by Changhyeok Bae <[email protected]>--- ...0001-lib-fix-ax25.h-include-for-musl.patch | 37 +++++++++++++++++++ ...{iproute2_5.15.0.bb => iproute2_5.16.0.bb} | 3 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch rename meta/recipes-connectivity/iproute2/{iproute2_5.15.0.bb => iproute2_5.16.0.bb} (64%)meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch new file +13
-0@@ -0,0 +1,37 @@ +From 8bced38a941a181f1468fa39541e872e51b6022f Mon Sep 17 00:00:00 2001 +From: Sam James <[email protected]> +Date: Thu, 13 Jan 2022 08:14:13 +0000 +Subject: [PATCH] lib: fix ax25.h include for musl + +ax25.h isn't guaranteed to be avilable in netax25/*; +it's dependent on our choice of libc (it's not available +on musl at least) [0]. + +Let's use the version from linux-headers. + +[0] https://sourceware.org/glibc/wiki/Synchronizing_Headers +Bug: https://bugs.gentoo.org/831102
Quoted 8 lines
meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch line 18
Quoted 5 lines
meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch new file +5
-0+ +Signed-off-by: Sam James <[email protected]> +Signed-off-by: Stephen Hemminger <[email protected]> + +Upstream-Status: Backportplease mention https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=8bced38a941a181f1468fa39541e872e51b6022f
here to point to backport link from upstream
Thanks, I tweaked the patch to add that.
Cheers,
Richard
Thank you.
2022년 1월 19일 (수) 11:41, Richard Purdie <[email protected]>님이 작성:
Quoted 50 lines · Khem Raj
Quoted 1 line
On Mon, Jan 17, 2022 at 5:31 PM Changhyeok Bae <[email protected]>
Quoted 2 lines · wrote:
Quoted 2 lines
0001-lib-fix-ax25.h-include-for-musl.patch is the fix for musl and
comes
Quoted 8 lines
Quoted 8 lines
from upstream.
Signed-off-by Changhyeok Bae <[email protected]>--- ...0001-lib-fix-ax25.h-include-for-musl.patch | 37 +++++++++++++++++++ ...{iproute2_5.15.0.bb => iproute2_5.16.0.bb} | 3 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644
meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patchQuoted 1 line
Quoted 1 line
rename meta/recipes-connectivity/iproute2/{iproute2_5.15.0.bb =>iproute2_5.16.0.bb} (64%)
Quoted 2 lines
Quoted 2 lines
diff --git
a/meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patchb/meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patchQuoted 4 lines
Quoted 4 lines
new file mode 100644
index 0000000000..338def399e
---/dev/null
+++
b/meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patchQuoted 13 lines
Quoted 13 lines
meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch new file +12
-0@@ -0,0 +1,37 @@ +From 8bced38a941a181f1468fa39541e872e51b6022f Mon Sep 17 00:00:00 2001 +From: Sam James <[email protected]> +Date: Thu, 13 Jan 2022 08:14:13 +0000 +Subject: [PATCH] lib: fix ax25.h include for musl + +ax25.h isn't guaranteed to be avilable in netax25/*; +it's dependent on our choice of libc (it's not available +on musl at least) [0]. + +Let's use the version from linux-headers. + +[0] https://sourceware.org/glibc/wiki/Synchronizing_HeadersQuoted 8 lines
meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch line 18
Quoted 6 lines
meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch new file +6
-0+Bug: https://bugs.gentoo.org/831102 + +Signed-off-by: Sam James <[email protected]> +Signed-off-by: Stephen Hemminger <[email protected]> + +Upstream-Status: Backportplease mention
Quoted 1 line
here to point to backport link from upstream
Quoted 7 lines
Thanks, I tweaked the patch to add that.
Cheers,
Richard
--
Thanks
Changhyeok