From patchwork Sun Aug 3 15:32:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 376071 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 7D43B1400AB for ; Mon, 4 Aug 2014 01:33:04 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 372428BE66; Sun, 3 Aug 2014 15:33:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JLz5ZbL1tJK7; Sun, 3 Aug 2014 15:33:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id CCB3D8BE0B; Sun, 3 Aug 2014 15:32:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 5F3061C1059 for ; Sun, 3 Aug 2014 15:32:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5BA7D8B9B4 for ; Sun, 3 Aug 2014 15:32:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2UZM4GwVOn9y for ; Sun, 3 Aug 2014 15:32:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 5A9A48B9BA for ; Sun, 3 Aug 2014 15:32:53 +0000 (UTC) Received: by mail-wg0-f43.google.com with SMTP id l18so6305347wgh.26 for ; Sun, 03 Aug 2014 08:32:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=mZQ1vFZTKakl5fUIKpSJs6NgBzo4HxdOqw1VR00wGlg=; b=oIfy+de7+Y3ly6w62xniM78n+sgv8XjDikUMzR4i4nWhBAUrDQqKFjKxquOnKQAOh8 rCLKXG6ZSy/n0RomDzp0NCBOoeCAmz/58ANRfi3kqu5CuZfnLgY87d3sYg+cYAsSR1t3 sP82xrTcvb6/kwc57YGOrSvTR61CD9EpHf3aPFcz4poKSBXzwMDZWE3od8eBM7PhznGz VgT8kEArnBzIPgLMRKtGJa6EkD1FY32iMGcmddWF1HPA7nTIfpRjno0fw443uzaKio3Q GviOJSVw9us9tysQdfkQU8n7J1bWCzXwiCOK3xQbeKKqgmRGp4EWmMZ4k9TluCE3aaLX SOKw== X-Received: by 10.194.5.103 with SMTP id r7mr24810370wjr.41.1407079971785; Sun, 03 Aug 2014 08:32:51 -0700 (PDT) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id gc1sm30901719wib.22.2014.08.03.08.32.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 03 Aug 2014 08:32:51 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sun, 3 Aug 2014 17:32:43 +0200 Message-Id: <437a2f63b7dd1357bf859133053f4b877bc2a0e9.1407079864.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: Cc: Thomas De Schampheleire Subject: [Buildroot] [PATCH 5/5 v4] busybox: convert to kconfig-package infrastructure X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Thomas De Schampheleire This patch converts the busybox package to the new kconfig-package infrastructure, thus removing code duplication and ensuring a consistent behavior of kconfig packages. Signed-off-by: Thomas De Schampheleire Reviewed-by: "Yann E. MORIN" Tested-by: "Yann E. MORIN" --- package/busybox/busybox.mk | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index f7d28a7..db29636 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -45,6 +45,10 @@ ifndef BUSYBOX_CONFIG_FILE BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG)) endif +BUSYBOX_KCONFIG_FILE = $(BUSYBOX_CONFIG_FILE) +BUSYBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig +BUSYBOX_KCONFIG_OPT = $(BUSYBOX_MAKE_OPTS) + define BUSYBOX_PERMISSIONS /bin/busybox f 4755 0 0 - - - - - /usr/share/udhcpc/default.script f 755 0 0 - - - - - @@ -136,10 +140,6 @@ define BUSYBOX_NETKITTELNET endef endif -define BUSYBOX_COPY_CONFIG - $(INSTALL) -D -m 0644 $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_BUILD_CONFIG) -endef - # Disable shadow passwords support if unsupported by the C library ifeq ($(BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS),) define BUSYBOX_INTERNAL_SHADOW_PASSWORDS @@ -190,8 +190,7 @@ define BUSYBOX_NOCLOBBER_INSTALL $(SED) 's/^noclobber="0"$$/noclobber="1"/' $(@D)/applets/install.sh endef -define BUSYBOX_CONFIGURE_CMDS - $(BUSYBOX_COPY_CONFIG) +define BUSYBOX_KCONFIG_FIXUP_CMDS $(BUSYBOX_SET_MMU) $(BUSYBOX_SET_LARGEFILE) $(BUSYBOX_SET_IPV6) @@ -203,6 +202,9 @@ define BUSYBOX_CONFIGURE_CMDS $(BUSYBOX_INTERNAL_SHADOW_PASSWORDS) $(BUSYBOX_SET_INIT) $(BUSYBOX_SET_WATCHDOG) +endef + +define BUSYBOX_CONFIGURE_CMDS @yes "" | $(MAKE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE="$(TARGET_CROSS)" \ -C $(@D) oldconfig $(BUSYBOX_NOCLOBBER_INSTALL) @@ -224,13 +226,4 @@ define BUSYBOX_INSTALL_TARGET_CMDS $(BUSYBOX_INSTALL_WATCHDOG_SCRIPT) endef -$(eval $(generic-package)) - -busybox-menuconfig busybox-xconfig busybox-gconfig: busybox-patch - $(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(BUSYBOX_DIR) \ - $(subst busybox-,,$@) - rm -f $(BUSYBOX_DIR)/.stamp_built - rm -f $(BUSYBOX_DIR)/.stamp_target_installed - -busybox-update-config: busybox-configure - cp -f $(BUSYBOX_BUILD_CONFIG) $(BUSYBOX_CONFIG_FILE) +$(eval $(kconfig-package))