From patchwork Thu Jul 24 17:49:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas De Schampheleire X-Patchwork-Id: 373478 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 660CE140216 for ; Fri, 25 Jul 2014 03:51:05 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 84B178B5B4; Thu, 24 Jul 2014 17:51:00 +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 o3QDfDMw6fZG; Thu, 24 Jul 2014 17:50:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 079798B625; Thu, 24 Jul 2014 17:50:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id BE2351C28CA for ; Thu, 24 Jul 2014 17:50:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B810A32249 for ; Thu, 24 Jul 2014 17:50:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YbBKw7w1YwjK for ; Thu, 24 Jul 2014 17:50:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) by silver.osuosl.org (Postfix) with ESMTPS id BDD6B26C92 for ; Thu, 24 Jul 2014 17:50:48 +0000 (UTC) Received: by mail-wi0-f176.google.com with SMTP id bs8so10139765wib.3 for ; Thu, 24 Jul 2014 10:50:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:content-transfer-encoding:subject :message-id:in-reply-to:references:user-agent:date:from:to:cc; bh=ZlqfhBDr94Q5k+/p1dsYlmJVmwiPDvR+ChPeVV6jl7c=; b=PLrOWIqF2adBgFj7LHvrbv/kmYc4K7TEHMyLAn38qsD3+AHIqkjGg6ebAtiU1BmViQ UiO2dsHKGyPTnFNI6bZHd9JBVWfhaKg87LQKxyJVJVnQSoBTAf7sfQiitkQy+bpc2D2o +4Y8EVg4t6122sa/Om1/0ipH5kIN4wVRuTRn5nAzVXSzcHDKPnmej5SxUL4Yg2X0WDCs 4tqXATEld4jNhfI1eZ/ejNVcRp+A2YYwl3P4zIgs9l9v0Kidc8cAny8YtwaN7NbfW/Q4 3rPv+wwq0rpvlraVmP/vZO6t20qHG0ZLaR97rSXt8k8AAR030Rev0P0wHXc/BCdFyVal UttA== X-Received: by 10.194.63.205 with SMTP id i13mr13257071wjs.74.1406224247181; Thu, 24 Jul 2014 10:50:47 -0700 (PDT) Received: from [127.0.0.1] ([109.140.129.55]) by mx.google.com with ESMTPSA id gc8sm25348272wic.3.2014.07.24.10.50.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Jul 2014 10:50:46 -0700 (PDT) MIME-Version: 1.0 X-Mercurial-Node: a850aa264c3d0ae5c61f3b0b1e89822551b1e99c Message-Id: In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.7.2 Date: Thu, 24 Jul 2014 19:49:32 +0200 From: Thomas De Schampheleire To: buildroot@buildroot.org Cc: thomas.petazzoni@free-electrons.com, "Yann E. MORIN" Subject: [Buildroot] [PATCH 5 of 7] 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: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net 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 --- package/busybox/busybox.mk | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff -r 80c907c0dfca -r a850aa264c3d package/busybox/busybox.mk --- a/package/busybox/busybox.mk Wed Jul 23 20:12:32 2014 +0200 +++ b/package/busybox/busybox.mk Tue Jul 22 20:43:10 2014 +0200 @@ -136,10 +136,6 @@ 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 +186,7 @@ $(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 +198,9 @@ $(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) @@ -226,11 +224,8 @@ $(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_KCONFIG_FILE = $(BUSYBOX_CONFIG_FILE) +BUSYBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig +BUSYBOX_KCONFIG_OPT = $(BUSYBOX_MAKE_OPTS) -busybox-update-config: busybox-configure - cp -f $(BUSYBOX_BUILD_CONFIG) $(BUSYBOX_CONFIG_FILE) +$(eval $(kconfig-package))