[1/3] busybox: remove musl specific tweaks

Message ID ea3c437cb4b462525feff0325c137d4b27717422.1525791919.git.baruch@tkos.co.il
State Accepted
Headers show
Series
  • [1/3] busybox: remove musl specific tweaks
Related show

Commit Message

Baruch Siach May 8, 2018, 3:05 p.m.
Busybox build fine under current musl using its provided shadow
passwords and utmp/wtmp support.

Cc: Adam Duskett <aduskett@gmail.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 package/busybox/busybox.mk | 16 ----------------
 1 file changed, 16 deletions(-)

Comments

Thomas Petazzoni May 13, 2018, 8:59 p.m. | #1
Hello,

On Tue,  8 May 2018 18:05:17 +0300, Baruch Siach wrote:
> Busybox build fine under current musl using its provided shadow
> passwords and utmp/wtmp support.
> 
> Cc: Adam Duskett <aduskett@gmail.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  package/busybox/busybox.mk | 16 ----------------
>  1 file changed, 16 deletions(-)

Series applied to next. Thanks!

Thomas

Patch

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 60a55a2c78a0..7033c4304a94 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -156,21 +156,6 @@  define BUSYBOX_INTERNAL_SHADOW_PASSWORDS
 endef
 endif
 
-# We also need to use internal shadow password functions when using
-# the musl C library, since some of them are not yet implemented by
-# musl.
-#
-# Do not use utmp/wmtp support. wmtp support is not available in musl,
-# and utmp support is not sufficient for Busybox.
-ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
-define BUSYBOX_MUSL_TWEAKS
-	$(call KCONFIG_ENABLE_OPT,CONFIG_USE_BB_PWD_GRP,$(BUSYBOX_BUILD_CONFIG))
-	$(call KCONFIG_ENABLE_OPT,CONFIG_USE_BB_SHADOW,$(BUSYBOX_BUILD_CONFIG))
-	$(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_UTMP,$(BUSYBOX_BUILD_CONFIG))
-	$(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_WTMP,$(BUSYBOX_BUILD_CONFIG))
-endef
-endif
-
 define BUSYBOX_INSTALL_UDHCPC_SCRIPT
 	if grep -q CONFIG_UDHCPC=y $(@D)/.config; then \
 		$(INSTALL) -m 0755 -D package/busybox/udhcpc.script \
@@ -293,7 +278,6 @@  define BUSYBOX_KCONFIG_FIXUP_CMDS
 	$(BUSYBOX_SET_WATCHDOG)
 	$(BUSYBOX_SET_SELINUX)
 	$(BUSYBOX_SET_INDIVIDUAL_BINARIES)
-	$(BUSYBOX_MUSL_TWEAKS)
 endef
 
 define BUSYBOX_CONFIGURE_CMDS