tree 896cc6ef780211b792d4d5bba81f61cb002d87c5
parent 1a18ddc78d187721889d483e4982e6bdd82ed083
author Sam Kunz <samkunz@google.com> 1606266139 +0000
committer Sam Kunz <samkunz@google.com> 1606341159 +0000

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>