diff options
| author |   Kenton Groombridge <concord@gentoo.org> | 2022-09-19 13:14:48 -0400 |
|---|---|---|
| committer | Kenton Groombridge <concord@gentoo.org> | 2022-09-19 13:20:59 -0400 |
| commit | 942fc9d97da6e465797296154b66e86687f30f51 (patch) | |
| tree | 234399fe0fbed06f9cbfb1722165235a31cc633f /sys-apps | |
| parent | sys-kernel/linux-firmware: Fix for symlink is blocked by a directory (diff) | |
| download | gentoo-942fc9d97da6e465797296154b66e86687f30f51.tar.gz gentoo-942fc9d97da6e465797296154b66e86687f30f51.tar.bz2 gentoo-942fc9d97da6e465797296154b66e86687f30f51.zip | |
sys-apps/policycoreutils: fix install on merged-usr
Upstream sestatus Makefile installs a compatibility symlink for
the sestatus binary. Remove this symlink when USE=merged-usr to
fix an internal file collision.
Closes: https://bugs.gentoo.org/871501
Signed-off-by: Kenton Groombridge <concord@gentoo.org>
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/policycoreutils/policycoreutils-3.3.ebuild | 7 | ||||
| -rw-r--r-- | sys-apps/policycoreutils/policycoreutils-3.4.ebuild | 7 | ||||
| -rw-r--r-- | sys-apps/policycoreutils/policycoreutils-9999.ebuild | 7 |
3 files changed, 18 insertions, 3 deletions
diff --git a/sys-apps/policycoreutils/policycoreutils-3.3.ebuild b/sys-apps/policycoreutils/policycoreutils-3.3.ebuild index fb97df7db201..2bcf57dff96c 100644 --- a/sys-apps/policycoreutils/policycoreutils-3.3.ebuild +++ b/sys-apps/policycoreutils/policycoreutils-3.3.ebuild @@ -138,7 +138,12 @@ src_install() { rm -fR "${D}/etc/rc.d" || die # compatibility symlinks - use split-usr && dosym ../../sbin/setfiles /usr/sbin/setfiles + if use split-usr; then + dosym ../../sbin/setfiles /usr/sbin/setfiles + else + # remove sestatus symlink + rm -f "${D}"/usr/sbin/sestatus || die + fi bashcomp_alias setsebool getsebool diff --git a/sys-apps/policycoreutils/policycoreutils-3.4.ebuild b/sys-apps/policycoreutils/policycoreutils-3.4.ebuild index eb49d7350f93..780a80e7b5c5 100644 --- a/sys-apps/policycoreutils/policycoreutils-3.4.ebuild +++ b/sys-apps/policycoreutils/policycoreutils-3.4.ebuild @@ -139,7 +139,12 @@ src_install() { rm -fR "${D}/etc/rc.d" || die # compatibility symlinks - use split-usr && dosym ../../sbin/setfiles /usr/sbin/setfiles + if use split-usr; then + dosym ../../sbin/setfiles /usr/sbin/setfiles + else + # remove sestatus symlink + rm -f "${D}"/usr/sbin/sestatus || die + fi bashcomp_alias setsebool getsebool diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild index 1ac0b78acdaf..add6d6f2b267 100644 --- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild +++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild @@ -139,7 +139,12 @@ src_install() { rm -fR "${D}/etc/rc.d" || die # compatibility symlinks - use split-usr && dosym ../../sbin/setfiles /usr/sbin/setfiles + if use split-usr; then + dosym ../../sbin/setfiles /usr/sbin/setfiles + else + # remove sestatus symlink + rm -f "${D}"/usr/sbin/sestatus || die + fi bashcomp_alias setsebool getsebool |