From: Alexander Kanavin <[email protected]> Signed-off-by: Alexander Kanavin <[email protected]> --- ...d38a941a181f1468fa39541e872e51b6022f.patch | 35 +++++++++++++++++++ ...{iproute2_5.15.0.bb => iproute2_5.16.0.bb} | 3 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-connectivity/iproute2/iproute2/8bced38a941a181f1468fa39541e872e51b6022f.patch rename meta/recipes-connectivity/iproute2/{iproute2_5.15.0.bb => iproute2_5.16.0.bb} (63%)
diff --git a/meta/recipes-connectivity/iproute2/iproute2/8bced38a941a181f1468fa39541e872e51b6022f.patch b/meta/recipes-connectivity/iproute2/iproute2/8bced38a941a181f1468fa39541e872e51b6022f.patch new file mode 100644 index 0000000000..289712683e --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2/8bced38a941a181f1468fa39541e872e51b6022f.patch @@ -0,0 +1,35 @@ +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 +Signed-off-by: Alexander Kanavin <[email protected]> +--- + 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 cfd0e04b0..3a72a43e9 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" + diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.15.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.16.0.bb similarity index 63% rename from meta/recipes-connectivity/iproute2/iproute2_5.15.0.bb rename to meta/recipes-connectivity/iproute2/iproute2_5.16.0.bb index 99a743391a..46c1b045c1 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_5.15.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_5.16.0.bb @@ -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://8bced38a941a181f1468fa39541e872e51b6022f.patch \ " -SRC_URI[sha256sum] = "38e3e4a5f9a7f5575c015027a10df097c149111eeb739993128e5b2b35b291ff" +SRC_URI[sha256sum] = "c064b66f6b001c2a35aa5224b5b1ac8aa4bee104d7dce30d6f10a84cb8b01e2f" # CFLAGS are computed in Makefile and reference CCOPTS # -- 2.20.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#160704): https://lists.openembedded.org/g/openembedded-core/message/160704 Mute This Topic: https://lists.openembedded.org/mt/88531402/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
