diff options
| author |   Sam James <sam@gentoo.org> | 2020-11-02 11:41:06 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2020-11-02 11:42:06 +0000 |
| commit | 58414b6f079cd6e3134624c6b834f39b87d0a925 (patch) | |
| tree | b18bce9b182a1b56e3270bcf5a5d3ac25e55fb1e /sys-apps/busybox | |
| parent | dev-python/beautifulsoup: Remove old (diff) | |
| download | gentoo-58414b6f079cd6e3134624c6b834f39b87d0a925.tar.gz gentoo-58414b6f079cd6e3134624c6b834f39b87d0a925.tar.bz2 gentoo-58414b6f079cd6e3134624c6b834f39b87d0a925.zip | |
sys-apps/busybox: fix 'make-symlinks' safeguard
Thanks-to: Ionen Wolkens <sudinave@gmail.com>
Bug: https://bugs.gentoo.org/703936
Closes: https://bugs.gentoo.org/752162
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-apps/busybox')
| -rw-r--r-- | sys-apps/busybox/busybox-1.31.1-r3.ebuild (renamed from sys-apps/busybox/busybox-1.31.1-r2.ebuild) | 2 | ||||
| -rw-r--r-- | sys-apps/busybox/busybox-1.32.0-r1.ebuild (renamed from sys-apps/busybox/busybox-1.32.0.ebuild) | 2 | ||||
| -rw-r--r-- | sys-apps/busybox/busybox-9999.ebuild | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sys-apps/busybox/busybox-1.31.1-r2.ebuild b/sys-apps/busybox/busybox-1.31.1-r3.ebuild index 8457f9229a41..ad50d096b749 100644 --- a/sys-apps/busybox/busybox-1.31.1-r2.ebuild +++ b/sys-apps/busybox/busybox-1.31.1-r3.ebuild @@ -303,7 +303,7 @@ src_install() { } pkg_preinst() { - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then + if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then ewarn "setting USE=make-symlinks and emerging to / is very dangerous." ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." ewarn "If you are creating a binary only and not merging this is probably ok." diff --git a/sys-apps/busybox/busybox-1.32.0.ebuild b/sys-apps/busybox/busybox-1.32.0-r1.ebuild index e4d93e71de3f..6d7a58111698 100644 --- a/sys-apps/busybox/busybox-1.32.0.ebuild +++ b/sys-apps/busybox/busybox-1.32.0-r1.ebuild @@ -302,7 +302,7 @@ src_install() { } pkg_preinst() { - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then + if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then ewarn "setting USE=make-symlinks and emerging to / is very dangerous." ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." ewarn "If you are creating a binary only and not merging this is probably ok." diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild index bf29c9fb1d87..a82a8aa33318 100644 --- a/sys-apps/busybox/busybox-9999.ebuild +++ b/sys-apps/busybox/busybox-9999.ebuild @@ -3,7 +3,7 @@ # See `man savedconfig.eclass` for info on how to use USE=savedconfig. -EAPI=6 +EAPI=7 inherit flag-o-matic savedconfig toolchain-funcs @@ -33,7 +33,7 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} mdev? ( !<sys-apps/openrc-0.13 )" -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" busybox_config_option() { local flag=$1 ; shift @@ -298,7 +298,7 @@ src_install() { } pkg_preinst() { - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then + if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then ewarn "setting USE=make-symlinks and emerging to / is very dangerous." ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." ewarn "If you are creating a binary only and not merging this is probably ok." |