From patchwork Wed May 18 19:25:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Williams X-Patchwork-Id: 623705 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3r941Y3CYMz9t6Y for ; Thu, 19 May 2016 05:26:09 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 35D4995905; Wed, 18 May 2016 19:26:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1-iho0h-AiVg; Wed, 18 May 2016 19:26:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id EC6FB95920; Wed, 18 May 2016 19:26:03 +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 EF51E1C0975 for ; Wed, 18 May 2016 19:25:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EC6ED91E59 for ; Wed, 18 May 2016 19:25:54 +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 M1lpmuYl5rts for ; Wed, 18 May 2016 19:25:54 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from sender163-mail.zoho.com (sender163-mail.zoho.com [74.201.84.163]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7E06291DDD for ; Wed, 18 May 2016 19:25:54 +0000 (UTC) Received: from localhost (32.97.110.52 [32.97.110.52]) by mx.zohomail.com with SMTPS id 1463599551594817.6102133789392; Wed, 18 May 2016 12:25:51 -0700 (PDT) From: Patrick Williams To: buildroot@busybox.net Date: Wed, 18 May 2016 14:25:28 -0500 Message-Id: <1463599530-28752-5-git-send-email-patrick@stwcx.xyz> X-Mailer: git-send-email 2.6.3 In-Reply-To: <1463599530-28752-1-git-send-email-patrick@stwcx.xyz> References: <1463599530-28752-1-git-send-email-patrick@stwcx.xyz> X-ZohoMail: Z_56716065 SPT_1 Z_56716064 SPT_1 SLF_D X-Zoho-Virus-Status: 2 Cc: Patrick Williams Subject: [Buildroot] [PATCH 4/6] Makefile: Add nested config dirs to list-defconfigs X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" Signed-off-by: Patrick Williams --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c9b6030..8a9bb2b 100644 --- a/Makefile +++ b/Makefile @@ -201,6 +201,10 @@ LEGAL_LICENSES_TXT_HOST = $(LEGAL_INFO_DIR)/host-licenses.txt LEGAL_WARNINGS = $(LEGAL_INFO_DIR)/.warnings LEGAL_REPORT = $(LEGAL_INFO_DIR)/README +BR2_DEFCONFIG_PATHS_LOCAL=$(sort $(dir $(wildcard $(TOPDIR)/configs/*/))) +BR2_DEFCONFIG_PATHS_USER=$(sort $(dir $(wildcard $(BR2_EXTERNAL)/configs/*/))) +BR2_DEFCONFIG_PATHS=$(BR2_DEFCONFIG_PATHS_LOCAL) $(BR2_DEFCONFIG_PATHS_USER) + BR2_CONFIG = $(CONFIG_DIR)/.config # Pull in the user's configuration file @@ -851,8 +855,6 @@ define CREATE_DEFCONFIG_RECIPES $$< --defconfig=$$(CONFIG_DIR)/.config $$(CONFIG_CONFIG_IN) endef -BR2_DEFCONFIG_PATHS=$(sort $(dir $(wildcard $(TOPDIR)/configs/*/))) \ - $(sort $(dir $(wildcard $(BR2_EXTERNAL)/configs/*/))) $(foreach path,$(BR2_DEFCONFIG_PATHS),$(eval $(call CREATE_DEFCONFIG_RECIPES,$(path)))) savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @@ -986,12 +988,12 @@ endif list-defconfigs: @echo 'Built-in configs:' - @$(foreach b, $(sort $(notdir $(wildcard $(TOPDIR)/configs/*_defconfig))), \ + @$(foreach b, $(sort $(notdir $(foreach path,$(BR2_DEFCONFIG_PATHS_LOCAL),$(wildcard $(path)/*_defconfig)))), \ printf " %-35s - Build for %s\\n" $(b) $(b:_defconfig=);) ifneq ($(wildcard $(BR2_EXTERNAL)/configs/*_defconfig),) @echo @echo 'User-provided configs:' - @$(foreach b, $(sort $(notdir $(wildcard $(BR2_EXTERNAL)/configs/*_defconfig))), \ + @$(foreach b, $(sort $(notdir $(foreach path,$(BR2_DEFCONFIG_PATHS_USER),$(wildcard $(path)/*_defconfig)))), \ printf " %-35s - Build for %s\\n" $(b) $(b:_defconfig=);) endif @echo