Hi all. After updating my profile to a merge-usr version by following the instructions provided by the related emerge news, I'm not able to innstall net-misc/openvswitch anymore. The package builds correctly but when it tryes to install, it fall into a file conflict: * Package 'net-misc/openvswitch-2.17.2-r1' has internal collisions * between non-identical files (located in separate directories in the * installation image (${D}) corresponding to merged directories in the * target filesystem (${ROOT})): * * /usr/bin/ovs-bugtool * /usr/bin/ovs-bugtool * /usr/sbin/ovs-bugtool * Differences: type, mode * * Package 'net-misc/openvswitch-2.17.2-r1' NOT merged due to internal * collisions between non-identical files. If necessary, refer to your * elog messages for the whole content of the above message. =net-misc/openvswitch-2.17.2-r1 Reproducible: Always Steps to Reproduce: 1. Update your profile to 17.1 merge-usr 2. Do an emerge -uDN @world 3. Try to merge net-misc/openvswitch
I tryed to create a new ebuild for the current 3.0.3 version, but the issue still occurs. Iade
Looks like the build system is installing the Python script to sbin, while the ebuild is properly installing with python-exec wrapping to /usr/bin: 7f2b32073bb8 ~ # file /var/tmp/portage/net-misc/openvswitch-2.17.2-r1/image/usr/sbin/ovs-bugtool /var/tmp/portage/net-misc/openvswitch-2.17.2-r1/image/usr/sbin/ovs-bugtool: Python script, ASCII text executable 7f2b32073bb8 ~ # file /var/tmp/portage/net-misc/openvswitch-2.17.2-r1/image/usr/bin/ovs-bugtool /var/tmp/portage/net-misc/openvswitch-2.17.2-r1/image/usr/bin/ovs-bugtool: broken symbolic link to ../lib/python-exec/python-exec2 So since we're installing the Python scripts manually, I guess the build system needs to be fixed to not install this one.
Of course, something like this works as well: @@ -103,6 +103,7 @@ src_install() { local SCRIPT if use monitor; then + 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 python_doscript utilities/"${SCRIPT}" done
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6b4565e4f32d431e10922941fddb71b1e464173 commit e6b4565e4f32d431e10922941fddb71b1e464173 Author: John Helmert III <ajak@gentoo.org> AuthorDate: 2023-01-06 15:32:18 +0000 Commit: John Helmert III <ajak@gentoo.org> CommitDate: 2023-01-06 15:33:46 +0000 net-misc/openvswitch: fix installation with merged-usr Closes: https://bugs.gentoo.org/889846 Signed-off-by: John Helmert III <ajak@gentoo.org> net-misc/openvswitch/openvswitch-2.15.0.ebuild | 7 ++++++- net-misc/openvswitch/openvswitch-2.17.2-r1.ebuild | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-)
Well! It works with version 3.0.3 too :) Iade
