| 1 |
commit: 2009022df92957c33f4a81c28e0039cfb4118a1f |
| 2 |
Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Apr 17 07:46:59 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 30 21:40:15 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2009022d |
| 7 |
|
| 8 |
sys-apps/busybox: Fix installation on split-usr systems |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/825718 |
| 11 |
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com> |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-apps/busybox/busybox-1.34.1-r1.ebuild | 4 +++- |
| 15 |
1 file changed, 3 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/sys-apps/busybox/busybox-1.34.1-r1.ebuild b/sys-apps/busybox/busybox-1.34.1-r1.ebuild |
| 18 |
index 702f98008ff3..1d060aa4237c 100644 |
| 19 |
--- a/sys-apps/busybox/busybox-1.34.1-r1.ebuild |
| 20 |
+++ b/sys-apps/busybox/busybox-1.34.1-r1.ebuild |
| 21 |
@@ -291,7 +291,9 @@ src_install() { |
| 22 |
rm _install/bin/busybox || die |
| 23 |
# for compatibility, provide /usr/bin/env |
| 24 |
mkdir -p _install/usr/bin || die |
| 25 |
- ln -s /bin/env _install/usr/bin/env || die |
| 26 |
+ if [[ ! -e _install/usr/bin/env ]]; then |
| 27 |
+ ln -s /bin/env _install/usr/bin/env || die |
| 28 |
+ fi |
| 29 |
tar cf busybox-links.tar -C _install . || : #;die |
| 30 |
insinto /usr/share/${PN} |
| 31 |
use make-symlinks && doins busybox-links.tar |
Archives