mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-30 13:00:02 +00:00
Code Issues Projects Releases Wiki Activity

ebtables: do not install /etc/ethertypes

Browse Source 
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 <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit af6f068632)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Yi Zhao
2020-12-16 16:29:16 +08:00
committed by Armin Kuster
parent d6d0ef5cae
commit f5324e4cd8
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-Makefile-do-not-install-etc-ethertypes.patch
+35
View File
@@ -0,0 +1,35 @@
From d3d72c9ca6a0ce2597adb02c786de28268973ccd Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
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 <yi.zhao@windriver.com>
---
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
meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb
+2 -1
View File
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=53b4a999993871a28ab1488fdbd2e73e"
SECTION = "net" SECTION = "net"
PR = "r4" PR = "r4"
RDEPENDS_${PN} += "bash" RDEPENDS_${PN} += "bash netbase"
RRECOMMENDS_${PN} += "kernel-module-ebtables \ 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://0007-extensions-Use-stdint-types.patch \
file://0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.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://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" SRC_URI_append_libc-musl = " file://0010-Adjust-header-include-sequence.patch"