* Drop backport patch Signed-off-by: Yi Zhao <[email protected]> --- ...-fix-build-with-kernel-5.15-and-musl.patch | 61 ------------------- ...0.9.bb => libnetfilter-conntrack_1.1.0.bb} | 6 +- 2 files changed, 2 insertions(+), 65 deletions(-) delete mode 100644 meta-networking/recipes-filter/libnetfilter/files/0001-conntrack-fix-build-with-kernel-5.15-and-musl.patch rename meta-networking/recipes-filter/libnetfilter/{libnetfilter-conntrack_1.0.9.bb => libnetfilter-conntrack_1.1.0.bb} (68%)
diff --git a/meta-networking/recipes-filter/libnetfilter/files/0001-conntrack-fix-build-with-kernel-5.15-and-musl.patch b/meta-networking/recipes-filter/libnetfilter/files/0001-conntrack-fix-build-with-kernel-5.15-and-musl.patch deleted file mode 100644 index a02940af3..000000000 --- a/meta-networking/recipes-filter/libnetfilter/files/0001-conntrack-fix-build-with-kernel-5.15-and-musl.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 21ee35dde73aec5eba35290587d479218c6dd824 Mon Sep 17 00:00:00 2001 -From: Robert Marko <[email protected]> -Date: Thu, 24 Feb 2022 15:01:11 +0100 -Subject: [PATCH] conntrack: fix build with kernel 5.15 and musl - -Currently, with kernel 5.15 headers and musl building is failing with -redefinition errors due to a conflict between the kernel and musl headers. - -Musl is able to suppres the conflicting kernel header definitions if they -are included after the standard libc ones, however since ICMP definitions -were moved into a separate internal header to avoid duplication this has -stopped working and is breaking the builds. - -It seems that the issue is that <netinet/in.h> which contains the UAPI -suppression defines is included in the internal.h header and not in the -proto.h which actually includes the kernel ICMP headers and thus UAPI -supression defines are not present. - -Solve this by moving the <netinet/in.h> include before the ICMP kernel -includes in the proto.h - -Fixes: bc1cb4b11403 ("conntrack: Move icmp request>reply type mapping to common file") -Signed-off-by: Robert Marko <[email protected]> -Signed-off-by: Florian Westphal <[email protected]> - -Upstream-Status: Backport -[https://git.netfilter.org/libnetfilter_conntrack/commit/?id=21ee35dde73aec5eba35290587d479218c6dd824] - -Signed-off-by: Yi Zhao <[email protected]> ---- - include/internal/internal.h | 1 - - include/internal/proto.h | 1 + - 2 files changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/internal/internal.h b/include/internal/internal.h -index 2ef8a90..7cd7c44 100644 ---- a/include/internal/internal.h -+++ b/include/internal/internal.h -@@ -14,7 +14,6 @@ - #include <arpa/inet.h> - #include <time.h> - #include <errno.h> --#include <netinet/in.h> - - #include <libnfnetlink/libnfnetlink.h> - #include <libnetfilter_conntrack/libnetfilter_conntrack.h> -diff --git a/include/internal/proto.h b/include/internal/proto.h -index 40e7bfe..60a5f4e 100644 ---- a/include/internal/proto.h -+++ b/include/internal/proto.h -@@ -2,6 +2,7 @@ - #define _NFCT_PROTO_H_ - - #include <stdint.h> -+#include <netinet/in.h> - #include <linux/icmp.h> - #include <linux/icmpv6.h> - --- -2.25.1 - diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.9.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.1.0.bb similarity index 68% rename from meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.9.bb rename to meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.1.0.bb index abec84b25..83533832d 100644 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.9.bb +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.1.0.bb @@ -6,12 +6,10 @@ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" DEPENDS = "libnfnetlink libmnl" -SRC_URI = "https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-${PV}.tar.bz2 \ - file://0001-conntrack-fix-build-with-kernel-5.15-and-musl.patch \ +SRC_URI = "https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-${PV}.tar.xz \ " -SRC_URI[md5sum] = "596c722733cdf30f24d4418f34f999d9" -SRC_URI[sha256sum] = "67bd9df49fe34e8b82144f6dfb93b320f384a8ea59727e92ff8d18b5f4b579a8" +SRC_URI[sha256sum] = "67edcb4eb826c2f8dc98af08dabff68f3b3d0fe6fb7d9d0ac1ee7ecce0fe694e" S = "${WORKDIR}/libnetfilter_conntrack-${PV}" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#112546): https://lists.openembedded.org/g/openembedded-devel/message/112546 Mute This Topic: https://lists.openembedded.org/mt/108711778/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
