diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-01-06 18:11:38 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-01-06 18:11:38 +0000 |
commit | 6c0d1528e3598898fd1026a3da35ffede0a1f14a (patch) | |
tree | d5ab9d7f6d2b41d05fb156069ee81e9ed779f12b /net-misc/openvswitch/openvswitch-2.15.0.ebuild | |
parent | 29efd7db303b443e103311cc0e458ee5c134e8e5 (diff) |
gentoo auto-resync : 06:01:2023 - 18:11:38
Diffstat (limited to 'net-misc/openvswitch/openvswitch-2.15.0.ebuild')
-rw-r--r-- | net-misc/openvswitch/openvswitch-2.15.0.ebuild | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net-misc/openvswitch/openvswitch-2.15.0.ebuild b/net-misc/openvswitch/openvswitch-2.15.0.ebuild index 83ea5328d7d0..a81e57ca0d58 100644 --- a/net-misc/openvswitch/openvswitch-2.15.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.15.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -90,6 +90,11 @@ src_install() { local SCRIPT if use monitor; then + # ovs-bugtool is installed to sbin by the build system, but we + # install it to bin below, and these clash in merged-usr + # https://bugs.gentoo.org/889846 + rm "${ED}"/usr/sbin/ovs-bugtool || die + for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}" python_foreach_impl python_doscript utilities/"${SCRIPT}" |