As promised in the ebuild comments, we can now remove the compatibility
symlink from /sbin -> /bin.
While we are at it, don't do the move conditional on split-usr. Arguably
only the symlink should have been conditionalized on this way back
when... we already move another binary too in the same way, but without
any conditional.
Bug: https://bugs.gentoo.org/547264
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
In bug 884323 it was noted that merged-usr systems get a conflict,
because upstream attempted to install a symlink in /sbin pointing to
/usr/sbin. It was noted in the bug that /sbin isn't needed at all,
despite which the chosen solution was to add IUSE=split-usr and
conditionally create the (useless) symlink.
In version 1.7.0 upstream dropped this entirely, indicating they don't
think it's a terribly good idea either. Take this opportunity to revert
everything and go install exclusively to /usr/sbin, which should have
been the original solution all along.
Bug: https://bugs.gentoo.org/884323
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
In bug 884323 it was noted that merged-usr systems get a conflict,
because upstream attempted to install a symlink in /sbin pointing to
/usr/sbin. It was noted in the bug that /sbin isn't needed at all,
despite which the chosen solution was to add IUSE=split-usr and
conditionally create the (useless) symlink.
In version 1.7.0 upstream dropped this entirely, so no symlink is
created either way -- but we still defined the USE flag and invalidated
binpkg changed-use matches. Also we wasted ebuild real estate redefining
the src_install function.
Get rid of this dead weight.
Bug: https://bugs.gentoo.org/884323
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
It was added in commit 02512e1d12 without
any explanation. Comparing builds, it does matter, though -- because on
split-usr systems, it uses and needs the udevdir to be /lib/udev.
Upstream detects this via pkg-config automagic with no way to override
it. But the ebuild never actually depended on virtual/pkgconfig
anyway... the good news is it only uses it for two things.
The other thing it uses it for is for detecting systemd to set the
default systemd unit directory when the configure option is not passed.
We want to install it unconditionally though, which means we cannot rely
on pkg-config for this either. That means we are using it for nothing.
Instead, explicitly set PKG_CONFIG=/bin/false to ensure it gets detected
as missing/broken, which means we fall back to the default udev
directory value, which is safe for split-usr systems.
While we are at it:
- ensure the systemdunitdir setting actually does something by declaring
the init type as systemd. The openrc files come from gentoo anyway and
are overwritten after emake install.
- avoid reinstalling the tmpfiles, which was originally added in commit
85d6acdce7 specifically to work around
the "only on systemd" issue.
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
Almost a decade ago, upstream moved their binary from libdir to sbindir.
Historically, Gentoo symlinked the binary into sbindir to make up for
this -- and when upstream moved to follow the Gentoo layout, the Gentoo
symlink overwrote the actual binary.
For some reason, at the time, the solution used was to add a
USE=split-usr and install extra symlinks for /sbin -> /usr/sbin even
though this didn't actually do something meaningful. The split-usr USE
flag has issues and using it unnecessarily should be avoided if
possible. Drop the USE flag, and the symlink, and stick with /usr/sbin
as upstream intends.
This should be 100% fine in all cases. The /sbin directory is only
needed for users who both have /usr on a different partition, *and*
don't use an initramfs. In such a case, it is nonsensical to provide a
symlink in /sbin that is a broken symlink to an un-mounted partition.
Bug: https://bugs.gentoo.org/517954
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
Michał Górny
Sam James
Eli Schwartz
Ulrich Müller
Mike Pagano
Andreas Sturmlechner
Hans de Graaff