From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1413670-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DD806158094 for <garchives@archives.gentoo.org>; Thu, 30 Jun 2022 21:41:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E3287E0D49; Thu, 30 Jun 2022 21:41:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E8BFAE0D48 for <gentoo-commits@lists.gentoo.org>; Thu, 30 Jun 2022 21:41:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B81B4341AA6 for <gentoo-commits@lists.gentoo.org>; Thu, 30 Jun 2022 21:41:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2AEF5527 for <gentoo-commits@lists.gentoo.org>; Thu, 30 Jun 2022 21:41:10 +0000 (UTC) From: "Sam James" <sam@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org> Message-ID: <1656625215.2009022df92957c33f4a81c28e0039cfb4118a1f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/busybox/busybox-1.34.1-r1.ebuild X-VCS-Directories: sys-apps/busybox/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2009022df92957c33f4a81c28e0039cfb4118a1f X-VCS-Branch: master Date: Thu, 30 Jun 2022 21:41:10 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2bea8050-a884-4927-93c2-28527434c946 X-Archives-Hash: df2c10a3d798a96a176938a6d17f00e7 commit: 2009022df92957c33f4a81c28e0039cfb4118a1f Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com> AuthorDate: Sun Apr 17 07:46:59 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jun 30 21:40:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2009022d sys-apps/busybox: Fix installation on split-usr systems Closes: https://bugs.gentoo.org/825718 Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> sys-apps/busybox/busybox-1.34.1-r1.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys-apps/busybox/busybox-1.34.1-r1.ebuild b/sys-apps/busybox/busybox-1.34.1-r1.ebuild index 702f98008ff3..1d060aa4237c 100644 --- a/sys-apps/busybox/busybox-1.34.1-r1.ebuild +++ b/sys-apps/busybox/busybox-1.34.1-r1.ebuild @@ -291,7 +291,9 @@ src_install() { rm _install/bin/busybox || die # for compatibility, provide /usr/bin/env mkdir -p _install/usr/bin || die - ln -s /bin/env _install/usr/bin/env || die + if [[ ! -e _install/usr/bin/env ]]; then + ln -s /bin/env _install/usr/bin/env || die + fi tar cf busybox-links.tar -C _install . || : #;die insinto /usr/share/${PN} use make-symlinks && doins busybox-links.tar