| 1 |
commit: bea8f9b0a3f1045bbb88b96ecd843bb7807e4f86 |
| 2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 1 18:16:51 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 2 04:26:44 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bea8f9b0 |
| 7 |
|
| 8 |
sys-apps/busybox: Sync live ebuild |
| 9 |
|
| 10 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/22462 |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-apps/busybox/busybox-9999.ebuild | 38 ++++++++++++++++++------------------ |
| 15 |
1 file changed, 19 insertions(+), 19 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild |
| 18 |
index 46cfa671124..987a0f8cbf2 100644 |
| 19 |
--- a/sys-apps/busybox/busybox-9999.ebuild |
| 20 |
+++ b/sys-apps/busybox/busybox-9999.ebuild |
| 21 |
@@ -10,11 +10,11 @@ inherit flag-o-matic savedconfig toolchain-funcs |
| 22 |
DESCRIPTION="Utilities for rescue and embedded systems" |
| 23 |
HOMEPAGE="https://www.busybox.net/" |
| 24 |
if [[ ${PV} == "9999" ]] ; then |
| 25 |
- MY_P=${P} |
| 26 |
+ MY_P="${P}" |
| 27 |
EGIT_REPO_URI="https://git.busybox.net/busybox" |
| 28 |
inherit git-r3 |
| 29 |
else |
| 30 |
- MY_P=${PN}-${PV/_/-} |
| 31 |
+ MY_P="${PN}-${PV/_/-}" |
| 32 |
SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2" |
| 33 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 34 |
fi |
| 35 |
@@ -26,18 +26,18 @@ REQUIRED_USE="pam? ( !static )" |
| 36 |
RESTRICT="test" |
| 37 |
|
| 38 |
# TODO: Could make pkgconfig conditional on selinux? bug #782829 |
| 39 |
-COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) |
| 40 |
+RDEPEND=" |
| 41 |
+ virtual/libcrypt:= |
| 42 |
+ !static? ( selinux? ( sys-libs/libselinux ) ) |
| 43 |
pam? ( sys-libs/pam ) |
| 44 |
- virtual/libcrypt:=" |
| 45 |
-DEPEND="${COMMON_DEPEND} |
| 46 |
+" |
| 47 |
+DEPEND="${RDEPEND} |
| 48 |
static? ( |
| 49 |
virtual/libcrypt[static-libs] |
| 50 |
selinux? ( sys-libs/libselinux[static-libs(+)] ) |
| 51 |
) |
| 52 |
- >=sys-kernel/linux-headers-2.6.39" |
| 53 |
+ sys-kernel/linux-headers" |
| 54 |
BDEPEND="virtual/pkgconfig" |
| 55 |
-RDEPEND="${COMMON_DEPEND} |
| 56 |
- mdev? ( !<sys-apps/openrc-0.13 )" |
| 57 |
|
| 58 |
S="${WORKDIR}/${MY_P}" |
| 59 |
|
| 60 |
@@ -264,20 +264,20 @@ src_install() { |
| 61 |
|
| 62 |
# add busybox daemon's, bug #444718 |
| 63 |
if busybox_config_enabled FEATURE_NTPD_SERVER; then |
| 64 |
- newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" |
| 65 |
- newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" |
| 66 |
+ newconfd "${FILESDIR}"/ntpd.confd busybox-ntpd |
| 67 |
+ newinitd "${FILESDIR}"/ntpd.initd busybox-ntpd |
| 68 |
fi |
| 69 |
if busybox_config_enabled SYSLOGD; then |
| 70 |
- newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" |
| 71 |
- newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" |
| 72 |
+ newconfd "${FILESDIR}"/syslogd.confd "busybox-syslogd |
| 73 |
+ newinitd "${FILESDIR}"/syslogd.initd "busybox-syslogd |
| 74 |
fi |
| 75 |
if busybox_config_enabled KLOGD; then |
| 76 |
- newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" |
| 77 |
- newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" |
| 78 |
+ newconfd "${FILESDIR}"/klogd.confd busybox-klogd |
| 79 |
+ newinitd "${FILESDIR}"/klogd.initd busybox-klogd |
| 80 |
fi |
| 81 |
if busybox_config_enabled WATCHDOG; then |
| 82 |
- newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" |
| 83 |
- newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" |
| 84 |
+ newconfd "${FILESDIR}"/watchdog.confd busybox-watchdog |
| 85 |
+ newinitd "${FILESDIR}"/watchdog.initd busybox-watchdog |
| 86 |
fi |
| 87 |
if busybox_config_enabled UDHCPC; then |
| 88 |
local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) |
| 89 |
@@ -291,10 +291,10 @@ src_install() { |
| 90 |
|
| 91 |
# bundle up the symlink files for use later |
| 92 |
emake DESTDIR="${ED}" install |
| 93 |
- rm _install/bin/busybox |
| 94 |
+ rm _install/bin/busybox || die |
| 95 |
# for compatibility, provide /usr/bin/env |
| 96 |
- mkdir -p _install/usr/bin |
| 97 |
- ln -s /bin/env _install/usr/bin/env |
| 98 |
+ mkdir -p _install/usr/bin || die |
| 99 |
+ ln -s /bin/env _install/usr/bin/env || die |
| 100 |
tar cf busybox-links.tar -C _install . || : #;die |
| 101 |
insinto /usr/share/${PN} |
| 102 |
use make-symlinks && doins busybox-links.tar |
Archives