From patchwork Tue May 8 15:05:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 910247 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=tkos.co.il Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40gN8Y4lnwz9s27 for ; Wed, 9 May 2018 01:05:33 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2815B85E67; Tue, 8 May 2018 15:05:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sxjuNtsAL7eX; Tue, 8 May 2018 15:05:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1E2E385C80; Tue, 8 May 2018 15:05:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 3BDEE1BFFDE for ; Tue, 8 May 2018 15:05:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 389CF85B7C for ; Tue, 8 May 2018 15:05:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cND9FMJYRz7A for ; Tue, 8 May 2018 15:05:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8B1CA85C80 for ; Tue, 8 May 2018 15:05:26 +0000 (UTC) Received: from tarshish.tkos.co.il (unknown [10.0.8.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPSA id 29073440ACC; Tue, 8 May 2018 18:05:24 +0300 (IDT) From: Baruch Siach To: buildroot@busybox.net Date: Tue, 8 May 2018 18:05:18 +0300 Message-Id: <86d4cbf3fb84d6b30b10525aa67167063b77a007.1525791919.git.baruch@tkos.co.il> X-Mailer: git-send-email 2.17.0 In-Reply-To: References: Subject: [Buildroot] [PATCH 2/3] busybox: remove shadow passwords config tweaks X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Duskett MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" These configuration tweaks were added for compatibility with Blackfin toolchains that bundled a uClibc version without shadow passwords support. Blackfin is gone, so this is no longer needed. Cc: Adam Duskett Signed-off-by: Baruch Siach --- package/busybox/busybox.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 7033c4304a94..75fe7e137b97 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -148,14 +148,6 @@ define BUSYBOX_PREFER_STATIC endef endif -# Disable shadow passwords support if unsupported by the C library -ifeq ($(BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS),) -define BUSYBOX_INTERNAL_SHADOW_PASSWORDS - $(call KCONFIG_ENABLE_OPT,CONFIG_USE_BB_PWD_GRP,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_USE_BB_SHADOW,$(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 \ @@ -273,7 +265,6 @@ define BUSYBOX_KCONFIG_FIXUP_CMDS $(BUSYBOX_SET_MDEV) $(BUSYBOX_SET_CRYPT_SHA) $(BUSYBOX_LINUX_PAM) - $(BUSYBOX_INTERNAL_SHADOW_PASSWORDS) $(BUSYBOX_SET_INIT) $(BUSYBOX_SET_WATCHDOG) $(BUSYBOX_SET_SELINUX)