summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/iptables/iptables
diff options
context:
space:
mode:
authorTrevor Gamblin <trevor.gamblin@windriver.com>2022-03-10 09:10:03 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-03-11 06:56:01 +0000
commitf69a9d7b39915422fed3915021b0682c84954cc0 (patch)
tree3513f59ec104c2ce225bdd8d5772c9abcc027384 /meta/recipes-extended/iptables/iptables
parent5331d29a898da61ce2df78bc1ce36dc23dcc0017 (diff)
downloadpoky-f69a9d7b39915422fed3915021b0682c84954cc0.tar.gz
iptables: do not install /etc/ethertypes
Take inspiration from the ebtables recipe in meta-networking and omit installation of etc/ethertypes, since it is provided by netbase. If we don't do this, the following error occurs during build: Error: Transaction test error: file /etc/ethertypes conflicts between attempted installs of iptables-1.8.7-r0.core2_64 and netbase-1:6.3-r0.noarch (From OE-Core rev: 297fde1a6fc9ddf12bb4b0cba1d5b03664a3f378) Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/iptables/iptables')
-rw-r--r--meta/recipes-extended/iptables/iptables/0001-Makefile.am-do-not-install-etc-ethertypes.patch40
1 files changed, 40 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 @@
1From a4ed9fc8da720585f853d2ca6ffd30e2fa4d1247 Mon Sep 17 00:00:00 2001
2From: Trevor Gamblin <trevor.gamblin@windriver.com>
3Date: Wed, 9 Mar 2022 12:50:39 -0500
4Subject: [PATCH] Makefile.am: do not install /etc/ethertypes
5
6The /etc/ethertypes is provided by netbase since 6.0[1].
7Do not instal the file in ebtables, otherwise there would be a conflict:
8Error: Transaction test error:
9 file /etc/ethertypes conflicts between attempted installs of
10netbase-1:6.2-r0.corei7_64 and iptables-1.8.7-r0.corei7_64
11
12[1]
13https://salsa.debian.org/md/netbase/-/commit/316680c6a2c3641b6abc76b3eebf88781f609d35)
14
15This patch is based off of the same change made for the ebtables recipe:
16
17http://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
19Upstream-Status: Inappropriate [embedded specific]
20
21Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
22---
23 Makefile.am | 1 -
24 1 file changed, 1 deletion(-)
25
26diff --git a/Makefile.am b/Makefile.am
27index 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--
392.35.1
40