| Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame^] | 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 | |