diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-11-13 00:31:00 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-11-13 00:33:19 -0500 |
| commit | a88ace55b415065fd71800db672557e54e065969 (patch) | |
| tree | c758b44a32a7a7198b93f2fe4a8d050450bd8e2b /sys-apps/busybox | |
| parent | sys-apps/busybox: version bump #564246 (diff) | |
| download | gentoo-a88ace55b415065fd71800db672557e54e065969.tar.gz gentoo-a88ace55b415065fd71800db672557e54e065969.tar.bz2 gentoo-a88ace55b415065fd71800db672557e54e065969.zip | |
sys-apps/busybox: move USE=static default to the profile #468580
Since busybox is pulled in via the linux profile (as we use it as the
rescue shell there), we should have the static USE flag set via the
profile too rather than the ebuild. This way we apply it only to the
subset of profiles where it makes sense.
For the live ebuild, we also switch to REQUIRED_USE since package.use
is able to override make.defaults (which is where USE=pam is set). We
can see how users react to this behavior before pulling it back into
the released versions.
Diffstat (limited to 'sys-apps/busybox')
| -rw-r--r-- | sys-apps/busybox/busybox-1.24.1.ebuild | 2 | ||||
| -rw-r--r-- | sys-apps/busybox/busybox-9999.ebuild | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sys-apps/busybox/busybox-1.24.1.ebuild b/sys-apps/busybox/busybox-1.24.1.ebuild index 9f87f6ef1275..f385277ea6b2 100644 --- a/sys-apps/busybox/busybox-1.24.1.ebuild +++ b/sys-apps/busybox/busybox-1.24.1.ebuild @@ -21,7 +21,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="debug ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd" +IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd" RESTRICT="test" COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild index 3fd4db957adb..af1e7532d1ab 100644 --- a/sys-apps/busybox/busybox-9999.ebuild +++ b/sys-apps/busybox/busybox-9999.ebuild @@ -21,7 +21,8 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="debug ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd" +IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd" +REQUIRED_USE="pam? ( !static )" RESTRICT="test" COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) @@ -131,9 +132,6 @@ src_configure() { busybox_config_option n UDHCPC6 fi - if use static && use pam ; then - ewarn "You cannot have USE='static pam'. Assuming static is more important." - fi busybox_config_option $(usex static n pam) PAM busybox_config_option static STATIC busybox_config_option syslog {K,SYS}LOGD LOGGER |