diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-03-08 20:17:51 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-09 09:17:03 -0800 |
commit | e49ac3eabba388444f83f96f068ed7c95f8a80be (patch) | |
tree | 06b7af46d7d04bf56833b4f61f47845b3981e04d /meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch | |
parent | 72d33a8bd58fd5e58eff0cf8110db1a20c8bd4e2 (diff) | |
download | poky-e49ac3eabba388444f83f96f068ed7c95f8a80be.tar.gz |
iptables: drop unnecessary patches
These were adding definitions for the second time
(see bug #10450 for why) or adding an include that isn't anymore
necessary for musl builds.
(From OE-Core rev: bed5ea53c74c4b444b2145e7a83ca9fd44ea30ec)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch')
-rw-r--r-- | meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch b/meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch deleted file mode 100644 index f1f85a6fa0..0000000000 --- a/meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | [PATCH] fix build with musl | ||
2 | |||
3 | Define additional TCOPTS if not there | ||
4 | u_initX types are in sys/types.h be explicit about it | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
10 | --- | ||
11 | diff -Naur iptables-1.6.0-origin/extensions/libxt_TCPOPTSTRIP.c iptables-1.6.0/extensions/libxt_TCPOPTSTRIP.c | ||
12 | --- iptables-1.6.0-origin/extensions/libxt_TCPOPTSTRIP.c 2015-12-09 14:55:06.000000000 +0200 | ||
13 | +++ iptables-1.6.0/extensions/libxt_TCPOPTSTRIP.c 2015-12-29 14:44:32.585327077 +0200 | ||
14 | @@ -12,6 +12,21 @@ | ||
15 | #ifndef TCPOPT_MD5SIG | ||
16 | # define TCPOPT_MD5SIG 19 | ||
17 | #endif | ||
18 | +#ifndef TCPOPT_MAXSEG | ||
19 | +#define TCPOPT_MAXSEG 2 | ||
20 | +#endif | ||
21 | +#ifndef TCPOPT_WINDOW | ||
22 | +#define TCPOPT_WINDOW 3 | ||
23 | +#endif | ||
24 | +#ifndef TCPOPT_SACK_PERMITTED | ||
25 | +#define TCPOPT_SACK_PERMITTED 4 | ||
26 | +#endif | ||
27 | +#ifndef TCPOPT_SACK | ||
28 | +#define TCPOPT_SACK 5 | ||
29 | +#endif | ||
30 | +#ifndef TCPOPT_TIMESTAMP | ||
31 | +#define TCPOPT_TIMESTAMP 8 | ||
32 | +#endif | ||
33 | |||
34 | enum { | ||
35 | O_STRIP_OPTION = 0, | ||
36 | diff -Naur iptables-1.6.0-origin/include/linux/netfilter_ipv4/ip_tables.h iptables-1.6.0/include/linux/netfilter_ipv4/ip_tables.h | ||
37 | --- iptables-1.6.0-origin/include/linux/netfilter_ipv4/ip_tables.h 2015-12-09 14:55:06.000000000 +0200 | ||
38 | +++ iptables-1.6.0/include/linux/netfilter_ipv4/ip_tables.h 2015-12-29 14:40:21.250469195 +0200 | ||
39 | @@ -15,6 +15,7 @@ | ||
40 | #ifndef _IPTABLES_H | ||
41 | #define _IPTABLES_H | ||
42 | |||
43 | +#include <sys/types.h> | ||
44 | #include <linux/types.h> | ||
45 | |||
46 | #include <linux/netfilter_ipv4.h> | ||