On Thu, May 16, 2024 at 4:27 AM Alexander Kanavin via lists.openembedded.org <[email protected]> wrote: > > From: Alexander Kanavin <[email protected]> > > Somewhere on the way it ceased to be necessary.
Thats due it being applied upstream [1] so mentioning that is perhaps going to qualify this a bit more. [1] https://git.netfilter.org/iptables/commit/iptables/xshared.h?id=f319389525b066b7dc6d389c88f16a0df3b8f189 > > Signed-off-by: Alexander Kanavin <[email protected]> > --- > ...ed.h-add-missing-sys.types.h-include.patch | 31 ------------------- > .../iptables/iptables_1.8.10.bb | 1 - > 2 files changed, 32 deletions(-) > delete mode 100644 > meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch > > diff --git > a/meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch > > b/meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch > deleted file mode 100644 > index a190c7e8ae2..00000000000 > --- > a/meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch > +++ /dev/null > @@ -1,31 +0,0 @@ > -From 465e3ef77f1763d225adc76220e43ee9bd73b178 Mon Sep 17 00:00:00 2001 > -From: Alexander Kanavin <[email protected]> > -Date: Tue, 17 May 2022 10:56:59 +0200 > -Subject: [PATCH] iptables/xshared.h: add missing sys.types.h include > - > -This resolves the build error under musl: > - > -| ../../../../../../../workspace/sources/iptables/iptables/xshared.h:83:56: > error: unknown type name 'u_int16_t'; did you mean 'uint16_t'? > -| 83 | set_option(unsigned int *options, unsigned int option, u_int16_t > *invflg, > -| | ^~~~~~~~~ > -| | uint16_t > - > -Upstream-Status: Submitted [via email to [email protected]] > -Signed-off-by: Alexander Kanavin <[email protected]> > - > ---- > - iptables/xshared.h | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/iptables/xshared.h b/iptables/xshared.h > -index a200e0d..f543dbf 100644 > ---- a/iptables/xshared.h > -+++ b/iptables/xshared.h > -@@ -6,6 +6,7 @@ > - #include <stdint.h> > - #include <netinet/in.h> > - #include <net/if.h> > -+#include <sys/types.h> > - #include <linux/netfilter_arp/arp_tables.h> > - #include <linux/netfilter_ipv4/ip_tables.h> > - #include <linux/netfilter_ipv6/ip6_tables.h> > diff --git a/meta/recipes-extended/iptables/iptables_1.8.10.bb > b/meta/recipes-extended/iptables/iptables_1.8.10.bb > index 5a878977425..cbd727b75df 100644 > --- a/meta/recipes-extended/iptables/iptables_1.8.10.bb > +++ b/meta/recipes-extended/iptables/iptables_1.8.10.bb > @@ -14,7 +14,6 @@ SRC_URI = > "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.xz \ > file://ip6tables.service \ > file://ip6tables.rules \ > > file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ > - > file://0002-iptables-xshared.h-add-missing-sys.types.h-include.patch \ > > file://0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch \ > " > SRC_URI[sha256sum] = > "5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c" > -- > 2.39.2 > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199495): https://lists.openembedded.org/g/openembedded-core/message/199495 Mute This Topic: https://lists.openembedded.org/mt/106132526/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
