Skip to contentSkip to conversation

iptables: Do not install /etc/ethertypes

PATCH In review Changhyeok Bae 2 participants 2 messages May 28, 2024 – Jun 3, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iptables: Do not install /etc/ethertypes

The patch file was deleted by mistaken during 1.8.10 upgrade. Re-introduce the patch file after re-writing based on 1.8.10 code.

---
 ...ile.am-do-not-install-etc-ethertypes.patch | 44 +++++++++++++++++++
 .../iptables/iptables_1.8.10.bb               |  1 +
 2 files changed, 45 insertions(+)
 create mode 100644 meta/recipes-extended/iptables/iptables/0003-Makefile.am-do-not-install-etc-ethertypes.patch
meta/recipes-extended/iptables/iptables/0003-Makefile.am-do-not-install-etc-ethertypes.patch new file +44 -0
new file mode 100644
index 0000000000..3aa40ac635
@@ -0,0 +1,44 @@
+From 77024225a4d7a39e362296f0d1e5188a7c9340d4 Mon Sep 17 00:00:00 2001
+From: Trevor Gamblin <[email protected]>
+Date: Tue, 28 May 2024 03:55:50 +0000
+Subject: [PATCH] Makefile.am do not install etc ethertypes
+
+The /etc/ethertypes is provided by netbase since 6.0[1].
+Do not instal the file in ebtables, otherwise there would be a conflict:
+Error: Transaction test error:
+  file /etc/ethertypes conflicts between attempted installs of
+netbase-1:6.2-r0.corei7_64 and iptables-1.8.7-r0.corei7_64
+
+[1] https://salsa.debian.org/md/netbase/-/commit/316680c6a2c3641b6abc76b3eebf88781f609d35)
+
+This patch is based off of the same change made for the ebtables recipe:
+
+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
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Trevor Gamblin <[email protected]>
+Signed-off-by: Changhyeok Bae <[email protected]>
+---
+ Makefile.am | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 299ab46..7b60eb4 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -18,11 +18,6 @@ SUBDIRS         += iptables
+ 
+ EXTRA_DIST	= autogen.sh iptables-test.py xlate-test.py
+ 
+-if ENABLE_NFTABLES
+-confdir		= $(sysconfdir)
+-dist_conf_DATA	= etc/ethertypes
+-endif
+-
+ .PHONY: tarball
+ tarball:
+ 	rm -Rf /tmp/${PACKAGE_TARNAME}-${PACKAGE_VERSION};
+-- 
+2.34.1
+
meta/recipes-extended/iptables/iptables_1.8.10.bb +1 -0
index 5a87897742..8cb9b76ca1 100644
@@ -14,6 +14,7 @@ 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://0003-Makefile.am-do-not-install-etc-ethertypes.patch \
            file://0002-iptables-xshared.h-add-missing-sys.types.h-include.patch \
            file://0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch \
            "
Signature · 1 line
2.34.1
#1 lore raw

Hello,

This doesn't apply on master, can you rebase?

Quoted 85 lines · Changhyeok Bae

The patch file was deleted by mistaken during 1.8.10 upgrade. Re-introduce the patch file after re-writing based on 1.8.10 code.

---
 ...ile.am-do-not-install-etc-ethertypes.patch | 44 +++++++++++++++++++
 .../iptables/iptables_1.8.10.bb               |  1 +
 2 files changed, 45 insertions(+)
 create mode 100644 meta/recipes-extended/iptables/iptables/0003-Makefile.am-do-not-install-etc-ethertypes.patch
meta/recipes-extended/iptables/iptables/0003-Makefile.am-do-not-install-etc-ethertypes.patch new file +44 -0
new file mode 100644
index 0000000000..3aa40ac635
@@ -0,0 +1,44 @@
+From 77024225a4d7a39e362296f0d1e5188a7c9340d4 Mon Sep 17 00:00:00 2001
+From: Trevor Gamblin <[email protected]>
+Date: Tue, 28 May 2024 03:55:50 +0000
+Subject: [PATCH] Makefile.am do not install etc ethertypes
+
+The /etc/ethertypes is provided by netbase since 6.0[1].
+Do not instal the file in ebtables, otherwise there would be a conflict:
+Error: Transaction test error:
+  file /etc/ethertypes conflicts between attempted installs of
+netbase-1:6.2-r0.corei7_64 and iptables-1.8.7-r0.corei7_64
+
+[1] https://salsa.debian.org/md/netbase/-/commit/316680c6a2c3641b6abc76b3eebf88781f609d35)
+
+This patch is based off of the same change made for the ebtables recipe:
+
+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
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Trevor Gamblin <[email protected]>
+Signed-off-by: Changhyeok Bae <[email protected]>
+---
+ Makefile.am | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 299ab46..7b60eb4 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -18,11 +18,6 @@ SUBDIRS         += iptables
+ 
+ EXTRA_DIST	= autogen.sh iptables-test.py xlate-test.py
+ 
+-if ENABLE_NFTABLES
+-confdir		= $(sysconfdir)
+-dist_conf_DATA	= etc/ethertypes
+-endif
+-
+ .PHONY: tarball
+ tarball:
+ 	rm -Rf /tmp/${PACKAGE_TARNAME}-${PACKAGE_VERSION};
+-- 
+2.34.1
+
meta/recipes-extended/iptables/iptables_1.8.10.bb +1 -0
index 5a87897742..8cb9b76ca1 100644
@@ -14,6 +14,7 @@ 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://0003-Makefile.am-do-not-install-etc-ethertypes.patch \
            file://0002-iptables-xshared.h-add-missing-sys.types.h-include.patch \
            file://0004-configure.ac-only-check-conntrack-when-libnfnetlink-.patch \
            "
Signature · 11 lines
2.34.1



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199950): https://lists.openembedded.org/g/openembedded-core/message/199950
Mute This Topic: https://lists.openembedded.org/mt/106343339/3617179
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com