From: Baruch Siach Date: Tue, 8 May 2018 15:05:17 +0000 (+0300) Subject: busybox: remove musl specific tweaks X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e0a8b910f66531421dde1f20ba9aac604dc24e86;p=buildroot.git busybox: remove musl specific tweaks Busybox build fine under current musl using its provided shadow passwords and utmp/wtmp support. Cc: Adam Duskett Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 60a55a2c78..7033c4304a 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