diff options
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/iptables/iptables/0001-Makefile.am-do-not-install-etc-ethertypes.patch | 40 | ||||
-rw-r--r-- | meta/recipes-extended/iptables/iptables_1.8.7.bb | 1 |
2 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-extended/iptables/iptables/0001-Makefile.am-do-not-install-etc-ethertypes.patch b/meta/recipes-extended/iptables/iptables/0001-Makefile.am-do-not-install-etc-ethertypes.patch new file mode 100644 index 0000000000..aa51265822 --- /dev/null +++ b/meta/recipes-extended/iptables/iptables/0001-Makefile.am-do-not-install-etc-ethertypes.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From a4ed9fc8da720585f853d2ca6ffd30e2fa4d1247 Mon Sep 17 00:00:00 2001 | ||
2 | From: Trevor Gamblin <trevor.gamblin@windriver.com> | ||
3 | Date: Wed, 9 Mar 2022 12:50:39 -0500 | ||
4 | Subject: [PATCH] Makefile.am: do not install /etc/ethertypes | ||
5 | |||
6 | The /etc/ethertypes is provided by netbase since 6.0[1]. | ||
7 | Do not instal the file in ebtables, otherwise there would be a conflict: | ||
8 | Error: Transaction test error: | ||
9 | file /etc/ethertypes conflicts between attempted installs of | ||
10 | netbase-1:6.2-r0.corei7_64 and iptables-1.8.7-r0.corei7_64 | ||
11 | |||
12 | [1] | ||
13 | https://salsa.debian.org/md/netbase/-/commit/316680c6a2c3641b6abc76b3eebf88781f609d35) | ||
14 | |||
15 | This patch is based off of the same change made for the ebtables recipe: | ||
16 | |||
17 | http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/recipes-filter/ebtables/ebtables-2.0.11/0001-Makefile.am-do-not-install-etc-ethertypes.patch?h=master | ||
18 | |||
19 | Upstream-Status: Inappropriate [embedded specific] | ||
20 | |||
21 | Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> | ||
22 | --- | ||
23 | Makefile.am | 1 - | ||
24 | 1 file changed, 1 deletion(-) | ||
25 | |||
26 | diff --git a/Makefile.am b/Makefile.am | ||
27 | index 799bf8b8..2eb1843f 100644 | ||
28 | --- a/Makefile.am | ||
29 | +++ b/Makefile.am | ||
30 | @@ -18,7 +18,6 @@ SUBDIRS += iptables | ||
31 | |||
32 | if ENABLE_NFTABLES | ||
33 | confdir = $(sysconfdir) | ||
34 | -dist_conf_DATA = etc/ethertypes | ||
35 | endif | ||
36 | |||
37 | .PHONY: tarball | ||
38 | -- | ||
39 | 2.35.1 | ||
40 | |||
diff --git a/meta/recipes-extended/iptables/iptables_1.8.7.bb b/meta/recipes-extended/iptables/iptables_1.8.7.bb index 69b4a48039..839733aaa8 100644 --- a/meta/recipes-extended/iptables/iptables_1.8.7.bb +++ b/meta/recipes-extended/iptables/iptables_1.8.7.bb | |||
@@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | |||
10 | 10 | ||
11 | SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ | 11 | SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ |
12 | file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ | 12 | file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ |
13 | file://0001-Makefile.am-do-not-install-etc-ethertypes.patch \ | ||
13 | file://0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch \ | 14 | file://0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch \ |
14 | file://iptables.service \ | 15 | file://iptables.service \ |
15 | file://iptables.rules \ | 16 | file://iptables.rules \ |