From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/
Date: Sat, 2 Oct 2021 04:27:13 +0000 (UTC) [thread overview]
Message-ID: <1633148804.bea8f9b0a3f1045bbb88b96ecd843bb7807e4f86.sam@gentoo> (raw)
commit: bea8f9b0a3f1045bbb88b96ecd843bb7807e4f86
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 1 18:16:51 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 2 04:26:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bea8f9b0
sys-apps/busybox: Sync live ebuild
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/22462
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/busybox/busybox-9999.ebuild | 38 ++++++++++++++++++------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index 46cfa671124..987a0f8cbf2 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -10,11 +10,11 @@ inherit flag-o-matic savedconfig toolchain-funcs
DESCRIPTION="Utilities for rescue and embedded systems"
HOMEPAGE="https://www.busybox.net/"
if [[ ${PV} == "9999" ]] ; then
- MY_P=${P}
+ MY_P="${P}"
EGIT_REPO_URI="https://git.busybox.net/busybox"
inherit git-r3
else
- MY_P=${PN}-${PV/_/-}
+ MY_P="${PN}-${PV/_/-}"
SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
fi
@@ -26,18 +26,18 @@ REQUIRED_USE="pam? ( !static )"
RESTRICT="test"
# TODO: Could make pkgconfig conditional on selinux? bug #782829
-COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
+RDEPEND="
+ virtual/libcrypt:=
+ !static? ( selinux? ( sys-libs/libselinux ) )
pam? ( sys-libs/pam )
- virtual/libcrypt:="
-DEPEND="${COMMON_DEPEND}
+"
+DEPEND="${RDEPEND}
static? (
virtual/libcrypt[static-libs]
selinux? ( sys-libs/libselinux[static-libs(+)] )
)
- >=sys-kernel/linux-headers-2.6.39"
+ sys-kernel/linux-headers"
BDEPEND="virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
- mdev? ( !<sys-apps/openrc-0.13 )"
S="${WORKDIR}/${MY_P}"
@@ -264,20 +264,20 @@ src_install() {
# add busybox daemon's, bug #444718
if busybox_config_enabled FEATURE_NTPD_SERVER; then
- newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
- newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
+ newconfd "${FILESDIR}"/ntpd.confd busybox-ntpd
+ newinitd "${FILESDIR}"/ntpd.initd busybox-ntpd
fi
if busybox_config_enabled SYSLOGD; then
- newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
- newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
+ newconfd "${FILESDIR}"/syslogd.confd "busybox-syslogd
+ newinitd "${FILESDIR}"/syslogd.initd "busybox-syslogd
fi
if busybox_config_enabled KLOGD; then
- newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
- newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
+ newconfd "${FILESDIR}"/klogd.confd busybox-klogd
+ newinitd "${FILESDIR}"/klogd.initd busybox-klogd
fi
if busybox_config_enabled WATCHDOG; then
- newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
- newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
+ newconfd "${FILESDIR}"/watchdog.confd busybox-watchdog
+ newinitd "${FILESDIR}"/watchdog.initd busybox-watchdog
fi
if busybox_config_enabled UDHCPC; then
local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
@@ -291,10 +291,10 @@ src_install() {
# bundle up the symlink files for use later
emake DESTDIR="${ED}" install
- rm _install/bin/busybox
+ rm _install/bin/busybox || die
# for compatibility, provide /usr/bin/env
- mkdir -p _install/usr/bin
- ln -s /bin/env _install/usr/bin/env
+ mkdir -p _install/usr/bin || die
+ ln -s /bin/env _install/usr/bin/env || die
tar cf busybox-links.tar -C _install . || : #;die
insinto /usr/share/${PN}
use make-symlinks && doins busybox-links.tar
next reply other threads:[~2021-10-02 4:27 UTC|newest]
Thread overview: 194+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-02 4:27 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-02-17 9:26 [gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/ Ulrich Müller
2024-12-28 12:08 Viorel Munteanu
2024-10-16 21:26 Sam James
2024-08-31 4:48 Sam James
2024-08-21 11:48 Sam James
2024-08-21 11:46 Arthur Zamarin
2024-08-21 11:46 Arthur Zamarin
2024-08-21 11:46 Arthur Zamarin
2024-08-21 11:46 Arthur Zamarin
2024-08-21 11:46 Arthur Zamarin
2024-07-04 1:42 Mike Gilbert
2024-04-26 18:07 Mike Gilbert
2024-03-29 15:48 Viorel Munteanu
2024-01-30 5:10 Sam James
2024-01-24 8:59 Viorel Munteanu
2024-01-16 23:57 Sam James
2024-01-16 23:57 Sam James
2024-01-16 23:57 Sam James
2024-01-16 23:57 Sam James
2024-01-16 23:57 Sam James
2024-01-16 23:57 Sam James
2023-12-16 10:38 Viorel Munteanu
2023-12-16 10:25 Viorel Munteanu
2023-08-17 13:07 Viorel Munteanu
2023-08-02 16:54 Sam James
2023-07-07 21:22 Sam James
2023-07-06 7:48 Sam James
2023-07-06 6:32 Sam James
2023-07-06 6:32 Sam James
2023-07-06 6:32 Sam James
2023-07-06 6:32 Sam James
2023-07-06 6:32 Sam James
2023-06-01 8:27 Viorel Munteanu
2023-06-01 8:27 Viorel Munteanu
2023-06-01 8:24 Viorel Munteanu
2023-05-31 5:01 Sam James
2023-05-29 23:50 Sam James
2023-05-29 17:50 Arthur Zamarin
2023-05-29 17:49 Arthur Zamarin
2023-05-29 13:10 Sam James
2023-05-29 13:01 Sam James
2023-05-29 13:01 Sam James
2023-05-29 12:57 Sam James
2023-05-24 15:35 Viorel Munteanu
2023-04-15 5:13 Sam James
2022-12-28 0:33 Sam James
2022-12-27 19:53 Sam James
2022-12-27 19:45 Sam James
2022-12-27 13:40 Sam James
2022-12-27 11:31 Sam James
2022-09-23 8:23 Sam James
2022-07-03 23:54 Sam James
2022-07-03 23:54 Sam James
2022-06-30 22:12 Sam James
2022-06-30 21:41 Sam James
2022-06-30 21:41 Sam James
2022-06-30 21:41 Sam James
2022-06-30 21:41 Sam James
2022-06-30 21:41 Sam James
2022-06-30 21:41 Sam James
2022-05-07 11:14 WANG Xuerui
2022-05-07 11:14 WANG Xuerui
2022-05-03 13:03 Jakov Smolić
2022-05-03 13:03 Jakov Smolić
2022-01-01 20:08 David Seifert
2021-11-20 10:23 Arthur Zamarin
2021-11-19 17:36 Arthur Zamarin
2021-11-19 15:36 Sam James
2021-11-19 11:39 Arthur Zamarin
2021-11-18 20:13 Arthur Zamarin
2021-11-18 12:26 Agostino Sarubbo
2021-11-18 12:25 Agostino Sarubbo
2021-11-18 12:24 Agostino Sarubbo
2021-11-05 22:28 Sam James
2021-10-17 3:21 Sam James
2021-10-10 20:37 Sam James
2021-10-08 18:49 Agostino Sarubbo
2021-10-08 18:49 Agostino Sarubbo
2021-10-08 18:48 Agostino Sarubbo
2021-10-08 18:48 Agostino Sarubbo
2021-10-08 18:25 Sam James
2021-10-03 17:15 Jakov Smolić
2021-10-02 7:10 Sam James
2021-10-02 4:27 Sam James
2021-09-18 3:04 Sam James
2021-09-16 1:18 Sam James
2021-09-06 19:59 Matt Turner
2021-08-26 22:52 Sam James
2021-08-16 16:36 Sam James
2021-05-26 9:02 Sam James
2021-05-26 9:02 Sam James
2021-05-26 9:02 Sam James
2021-04-14 16:12 Sam James
2021-03-31 22:54 Thomas Deutschmann
2021-01-10 9:43 Sam James
2021-01-09 16:28 Sam James
2021-01-09 16:22 Sam James
2021-01-09 13:12 Sergei Trofimovich
2021-01-08 12:20 Sam James
2021-01-07 16:52 Sam James
2021-01-07 12:27 Sam James
2021-01-07 5:11 Sam James
2021-01-07 0:58 Sam James
2021-01-06 6:35 Sam James
2021-01-05 22:58 Sam James
2021-01-05 22:55 Sam James
2020-11-02 11:42 Sam James
2020-07-15 11:02 Mikle Kolyada
2020-03-22 13:29 Mikle Kolyada
2020-03-22 13:29 Mikle Kolyada
2020-02-07 3:41 Patrick McLean
2019-10-27 17:57 Mikle Kolyada
2019-10-27 17:54 Mikle Kolyada
2019-08-05 12:54 Mikle Kolyada
2019-06-13 13:45 Mikle Kolyada
2019-05-04 9:31 Mikle Kolyada
2019-03-08 20:41 Mikle Kolyada
2019-02-16 9:38 Mikle Kolyada
2019-02-16 9:38 Mikle Kolyada
2019-01-13 5:01 Mikle Kolyada
2018-12-02 17:44 Mikle Kolyada
2018-12-02 17:44 Mikle Kolyada
2018-11-24 16:48 Mikle Kolyada
2018-09-22 10:28 Mikle Kolyada
2018-09-12 6:45 Jeroen Roovers
2018-09-03 13:53 Mikle Kolyada
2018-08-23 2:52 Mikle Kolyada
2018-08-22 19:20 Mart Raudsepp
2018-08-22 2:13 Mikle Kolyada
2018-08-22 2:13 Mikle Kolyada
2018-08-22 2:11 Mikle Kolyada
2018-08-21 0:13 Sergei Trofimovich
2018-08-20 3:49 Mikle Kolyada
2018-08-18 22:31 Sergei Trofimovich
2018-08-18 22:24 Sergei Trofimovich
2018-08-18 3:43 Mikle Kolyada
2018-08-17 21:12 Sergei Trofimovich
2018-08-17 2:20 Mikle Kolyada
2018-07-20 3:48 Jeroen Roovers
2018-07-04 8:32 Jeroen Roovers
2018-06-04 13:06 Mike Frysinger
2018-05-29 14:30 Mikle Kolyada
2018-05-29 14:30 Mikle Kolyada
2018-05-15 1:19 Anthony G. Basile
2018-04-23 14:18 Anthony G. Basile
2018-04-04 9:04 Jeroen Roovers
2018-03-26 16:57 Anthony G. Basile
2018-03-25 18:49 Mikle Kolyada
2018-03-12 3:58 Matt Turner
2018-03-07 19:51 Sergei Trofimovich
2018-03-02 11:44 Mart Raudsepp
2018-02-10 14:05 Sergei Trofimovich
2018-02-06 23:25 Sergei Trofimovich
2018-02-05 21:27 Markus Meier
2018-01-31 20:00 Sergei Trofimovich
2018-01-28 18:23 Tobias Klausmann
2018-01-28 2:17 Anthony G. Basile
2018-01-28 0:36 Mikle Kolyada
2018-01-24 18:42 Anthony G. Basile
2018-01-24 4:31 Mike Frysinger
2018-01-24 4:16 Mike Frysinger
2018-01-19 23:33 Mike Frysinger
2017-09-24 23:01 Tim Harder
2017-09-24 23:01 Tim Harder
2017-08-25 11:17 Jeroen Roovers
2017-08-25 11:17 Jeroen Roovers
2017-04-26 21:12 Mike Frysinger
2016-12-22 6:15 Mike Frysinger
2016-12-22 6:15 Mike Frysinger
2016-12-22 6:15 Mike Frysinger
2016-12-17 15:25 Markus Meier
2016-12-13 11:30 Agostino Sarubbo
2016-12-13 11:05 Agostino Sarubbo
2016-12-12 15:55 Tobias Klausmann
2016-11-11 18:04 Anthony G. Basile
2016-07-08 12:02 Agostino Sarubbo
2016-07-08 10:02 Agostino Sarubbo
2016-05-02 3:33 Matt Turner
2016-04-20 3:58 Mike Frysinger
2016-04-11 10:39 Agostino Sarubbo
2016-03-30 18:32 Markus Meier
2016-03-27 10:16 Agostino Sarubbo
2016-03-26 6:49 Jeroen Roovers
2016-03-22 14:32 Agostino Sarubbo
2015-12-31 5:35 Mike Frysinger
2015-12-25 18:19 Agostino Sarubbo
2015-12-05 12:44 Markus Meier
2015-12-04 6:45 Jeroen Roovers
2015-12-04 5:51 Jeroen Roovers
2015-12-02 20:51 Mike Gilbert
2015-12-02 14:29 Agostino Sarubbo
2015-11-16 6:32 Ulrich Müller
2015-10-28 21:29 Michael Sterrett
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1633148804.bea8f9b0a3f1045bbb88b96ecd843bb7807e4f86.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox