ebtables: resolve etc/ethertypes file collision
This change manually fixes a bug in ebtables ebuild file in upstream
portage-stable. Issue was that file etc/ethertypes was getting
placed multiple times, which created a file collision error when
emerging ebtables package.
With this change, ebtables is now able to be emerged.
ebtables needs to be updated in order to resolve a dependency
conflict with iptables.
BUG=b/173158844
TEST=presubmit
RELEASE_NOTE=none
Change-Id: I4a9d8616ade122b8d52b4f3d5edff395c535f961
Reviewed-on: https://cos-review.googlesource.com/c/third_party/overlays/portage-stable/+/9082
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Robert Kolchmeyer <rkolchmeyer@google.com>
diff --git a/metadata/md5-cache/net-firewall/ebtables-2.0.11-r2 b/metadata/md5-cache/net-firewall/ebtables-2.0.11-r3
similarity index 95%
rename from metadata/md5-cache/net-firewall/ebtables-2.0.11-r2
rename to metadata/md5-cache/net-firewall/ebtables-2.0.11-r3
index fbda2f3..c6b95d1 100644
--- a/metadata/md5-cache/net-firewall/ebtables-2.0.11-r2
+++ b/metadata/md5-cache/net-firewall/ebtables-2.0.11-r3
@@ -11,4 +11,4 @@
SLOT=0
SRC_URI=ftp://ftp.netfilter.org/pub/ebtables/ebtables-2.0.11.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=da0a0e77269e7420e7ccd340a5c5ba83
+_md5_=1c5e7043cd8e8bc4890d0c9d4926fe58
diff --git a/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
similarity index 98%
rename from net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
rename to net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
index 97a7ab8..b73fd70 100644
--- a/net-firewall/ebtables/ebtables-2.0.11-r2.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.11-r3.ebuild
@@ -75,11 +75,11 @@
newconfd "${FILESDIR}"/ebtables.confd-r1 ebtables
find "${D}" -name '*.la' -type f -delete || die
+
+ rm "${ED%/}"/etc/ethertypes || die
else
into /
newsbin static ebtables
- insinto /etc
- doins ethertypes
fi
newman ebtables-legacy.8 ebtables.8
