summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex@linutronix.de>2024-05-16 13:26:37 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-05-28 09:38:23 +0100
commit640dafd0c4853dd1f30dc903188dc7b51a8bf03a (patch)
tree0ca9d78205c6b1002a7fb3f38e2aab9cdf3b6c02 /meta
parent854429b571608696963cee657a624a0b6453938a (diff)
downloadpoky-640dafd0c4853dd1f30dc903188dc7b51a8bf03a.tar.gz
iptables: remove unneeded 0002-iptables-xshared.h-add-missing-sys.types.h-include.patch
Somewhere on the way it ceased to be necessary. (From OE-Core rev: b5a32b5744b4ebb1bdc8937e5ebbc35dced0b1a7) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch31
-rw-r--r--meta/recipes-extended/iptables/iptables_1.8.10.bb1
2 files changed, 0 insertions, 32 deletions
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 a190c7e8ae..0000000000
--- a/meta/recipes-extended/iptables/iptables/0002-iptables-xshared.h-add-missing-sys.types.h-include.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 465e3ef77f1763d225adc76220e43ee9bd73b178 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 17 May 2022 10:56:59 +0200
4Subject: [PATCH] iptables/xshared.h: add missing sys.types.h include
5
6This resolves the build error under musl:
7
8| ../../../../../../../workspace/sources/iptables/iptables/xshared.h:83:56: error: unknown type name 'u_int16_t'; did you mean 'uint16_t'?
9| 83 | set_option(unsigned int *options, unsigned int option, u_int16_t *invflg,
10| | ^~~~~~~~~
11| | uint16_t
12
13Upstream-Status: Submitted [via email to phil@nwl.cc]
14Signed-off-by: Alexander Kanavin <alex@linutronix.de>
15
16---
17 iptables/xshared.h | 1 +
18 1 file changed, 1 insertion(+)
19
20diff --git a/iptables/xshared.h b/iptables/xshared.h
21index a200e0d..f543dbf 100644
22--- a/iptables/xshared.h
23+++ b/iptables/xshared.h
24@@ -6,6 +6,7 @@
25 #include <stdint.h>
26 #include <netinet/in.h>
27 #include <net/if.h>
28+#include <sys/types.h>
29 #include <linux/netfilter_arp/arp_tables.h>
30 #include <linux/netfilter_ipv4/ip_tables.h>
31 #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 5a87897742..cbd727b75d 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 \
14 file://ip6tables.service \ 14 file://ip6tables.service \
15 file://ip6tables.rules \ 15 file://ip6tables.rules \
16 file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ 16 file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \
17 file://0002-iptables-xshared.h-add-missing-sys.types.h-include.patch \
18 file://0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch \ 17 file://0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch \
19 " 18 "
20SRC_URI[sha256sum] = "5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c" 19SRC_URI[sha256sum] = "5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c"