From patchwork Wed Jul 30 19:58:06 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: 375035 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 74B541400E0 for ; Thu, 31 Jul 2014 05:59:27 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B43D932E6F; Wed, 30 Jul 2014 19:59:26 +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 MLSqyjIMMr4z; Wed, 30 Jul 2014 19:59:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 1E9F132EA3; Wed, 30 Jul 2014 19:59:14 +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 ADAD01BF831 for ; Wed, 30 Jul 2014 19:59:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A01C332E84 for ; Wed, 30 Jul 2014 19:59:03 +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 nwtPEvN2q4+I for ; Wed, 30 Jul 2014 19:58:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f176.google.com (mail-we0-f176.google.com [74.125.82.176]) by silver.osuosl.org (Postfix) with ESMTPS id 4E5C732E79 for ; Wed, 30 Jul 2014 19:58:58 +0000 (UTC) Received: by mail-we0-f176.google.com with SMTP id q58so1747964wes.21 for ; Wed, 30 Jul 2014 12:58:56 -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; bh=8xgcsYzxAREGY5szJxgxKarz6d5X9Pc5lOgATydFB54=; b=ASxu7HprUIIGeUL9lP/aMrEiEOE3u0xSHFEnx1PA9Gu3MpDXWBDQJmqYvyRrfYIhDf D6eUrF6LyLpTb2hCRAK+b7WWgiLNPOUaNSDW9WYFGsOH8fAGejDEuIPvUV1Fi0AABjOi HDT++VTZceGVnvc43mi8JRcZINqHsgwPLokKeF2JhJdYPNETloTN17UEt2PgQVr4X0Ed WtzDPY2lEyMtACqLR3zSvJgB2Ew1ONKNOlB7zKPrqO9lC30jA/lr5dsaObCo8K2JOciB JwjmquVG9+w46Ir4k6DNjP1S3ILvnNvhjrqJYaP+CJMhkyo/gQ14VVNjyzVZ1pz0qP0K DsXA== X-Received: by 10.180.81.103 with SMTP id z7mr9857097wix.23.1406750336667; Wed, 30 Jul 2014 12:58:56 -0700 (PDT) Received: from [127.0.0.1] (d54C62EEB.access.telenet.be. [84.198.46.235]) by mx.google.com with ESMTPSA id f6sm7815511wja.25.2014.07.30.12.58.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jul 2014 12:58:55 -0700 (PDT) MIME-Version: 1.0 X-Mercurial-Node: f995a8adfa241295aceea442afcf6ee1837ba494 Message-Id: In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.7.2 Date: Wed, 30 Jul 2014 21:58:06 +0200 From: Thomas De Schampheleire To: buildroot@buildroot.org Subject: [Buildroot] [PATCH 5 of 6 v2] 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 Reviewed-by: "Yann E. MORIN" --- v2: rebase after making kconfig-package a full infra package/busybox/busybox.mk | 25 +++++++++---------------- 1 files changed, 9 insertions(+), 16 deletions(-) diff -r 540167f28c2d -r f995a8adfa24 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 @@ -45,6 +45,10 @@ 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 @@ 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 @@ $(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 @@ $(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 @@ $(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))