From: Yi Zhao <[email protected]> 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 ebtables-2.0.10+4-r4.corei7_64
[1] https://salsa.debian.org/md/netbase/-/commit/316680c6a2c3641b6abc76b3eebf88781f609d35 Signed-off-by: Yi Zhao <[email protected]> Signed-off-by: Khem Raj <[email protected]> (cherry picked from commit af6f068632281f8abd42dd3e3301eddd2b0d3ae4) Signed-off-by: Armin Kuster <[email protected]> --- ...kefile-do-not-install-etc-ethertypes.patch | 35 +++++++++++++++++++ .../ebtables/ebtables_2.0.10-4.bb | 3 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-Makefile-do-not-install-etc-ethertypes.patch diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-Makefile-do-not-install-etc-ethertypes.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-Makefile-do-not-install-etc-ethertypes.patch new file mode 100644 index 0000000000..65f5938809 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-Makefile-do-not-install-etc-ethertypes.patch @@ -0,0 +1,35 @@ +From d3d72c9ca6a0ce2597adb02c786de28268973ccd Mon Sep 17 00:00:00 2001 +From: Yi Zhao <[email protected]> +Date: Wed, 16 Dec 2020 15:49:24 +0800 +Subject: [PATCH] Makefile: 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 ebtables-2.0.10+4-r4.corei7_64 + +[1] https://salsa.debian.org/md/netbase/-/commit/316680c6a2c3641b6abc76b3eebf88781f609d35) + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <[email protected]> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 95651b6..85c5f98 100644 +--- a/Makefile ++++ b/Makefile +@@ -184,7 +184,7 @@ exec: ebtables ebtables-restore + install -m 0755 ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore + + .PHONY: install +-install: $(MANDIR)/man8/ebtables.8 $(DESTDIR)$(ETHERTYPESFILE) exec scripts ++install: $(MANDIR)/man8/ebtables.8 exec scripts + mkdir -p $(DESTDIR)$(LIBDIR) + install -m 0755 extensions/*.so $(DESTDIR)$(LIBDIR) + install -m 0755 *.so $(DESTDIR)$(LIBDIR) +-- +2.17.1 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb index 276784009f..bf523502e1 100644 --- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb +++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=53b4a999993871a28ab1488fdbd2e73e" SECTION = "net" PR = "r4" -RDEPENDS_${PN} += "bash" +RDEPENDS_${PN} += "bash netbase" RRECOMMENDS_${PN} += "kernel-module-ebtables \ " @@ -31,6 +31,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \ file://0007-extensions-Use-stdint-types.patch \ file://0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch \ file://0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch \ + file://0001-Makefile-do-not-install-etc-ethertypes.patch \ " SRC_URI_append_libc-musl = " file://0010-Adjust-header-include-sequence.patch" -- 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#88809): https://lists.openembedded.org/g/openembedded-devel/message/88809 Mute This Topic: https://lists.openembedded.org/mt/79755667/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
