summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2017-09-24 18:49:27 -0400
committerTim Harder <radhermit@gentoo.org>2017-09-24 19:01:11 -0400
commitea75b864b15ac5efac481ce901e58014ab05e577 (patch)
treeb8234e251ea518c32ff87139a11e67860b3aba0f /sys-apps
parentdev-python/pytest-html: version bump to 1.16.0 (diff)
downloadgentoo-ea75b864b15ac5efac481ce901e58014ab05e577.tar.gz
gentoo-ea75b864b15ac5efac481ce901e58014ab05e577.tar.bz2
gentoo-ea75b864b15ac5efac481ce901e58014ab05e577.zip
sys-apps/busybox: explicitly disable SH_IS_HUSH config option
Otherwise this can hang in certain situations when `make oldconfig` is called.
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/busybox/busybox-1.26.2-r1.ebuild1
-rw-r--r--sys-apps/busybox/busybox-1.27.2.ebuild1
2 files changed, 2 insertions, 0 deletions
diff --git a/sys-apps/busybox/busybox-1.26.2-r1.ebuild b/sys-apps/busybox/busybox-1.26.2-r1.ebuild
index 6c42e41a4521..19d62510f287 100644
--- a/sys-apps/busybox/busybox-1.26.2-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.26.2-r1.ebuild
@@ -128,6 +128,7 @@ src_configure() {
busybox_config_option y ASH
busybox_config_option y SH_IS_ASH
busybox_config_option n HUSH
+ busybox_config_option n SH_IS_HUSH
busybox_config_option '"/run"' PID_FILE_PATH
busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH
diff --git a/sys-apps/busybox/busybox-1.27.2.ebuild b/sys-apps/busybox/busybox-1.27.2.ebuild
index 20785227f939..80b530dc184a 100644
--- a/sys-apps/busybox/busybox-1.27.2.ebuild
+++ b/sys-apps/busybox/busybox-1.27.2.ebuild
@@ -128,6 +128,7 @@ src_configure() {
busybox_config_option y ASH
busybox_config_option y SH_IS_ASH
busybox_config_option n HUSH
+ busybox_config_option n SH_IS_HUSH
busybox_config_option '"/run"' PID_FILE_PATH
busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH