From patchwork Fri Apr 15 15:40:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Williams X-Patchwork-Id: 611028 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 3qmhzy6zyKz9sBc for ; Sat, 16 Apr 2016 01:59:10 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 428D68406F; Fri, 15 Apr 2016 15:59:10 +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 JLNFpBnXvQaE; Fri, 15 Apr 2016 15:59:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9BF208476D; Fri, 15 Apr 2016 15:59:09 +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 1384B1C12CE for ; Fri, 15 Apr 2016 15:59:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0B2B08A33F for ; Fri, 15 Apr 2016 15:59:08 +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 8keJAXzEh09c for ; Fri, 15 Apr 2016 15:59:07 +0000 (UTC) X-Greylist: delayed 00:15:03 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 489708A18D for ; Fri, 15 Apr 2016 15:59:07 +0000 (UTC) Received: from localhost (32.97.110.55 [32.97.110.55]) by mx.zohomail.com with SMTPS id 1460735038161273.2756538193662; Fri, 15 Apr 2016 08:43:58 -0700 (PDT) From: Patrick Williams To: buildroot@busybox.net Date: Fri, 15 Apr 2016 10:40:34 -0500 Message-Id: <1460734834-32123-1-git-send-email-patrick@stwcx.xyz> X-Mailer: git-send-email 2.6.3 X-ZohoMail: Z_56716065 SPT_1 Z_56716064 SPT_1 SLF_D X-Zoho-Virus-Status: 2 Cc: Patrick Williams , Elizabeth Liner Subject: [Buildroot] [PATCH] Adding in support for custom configurations 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" From: Elizabeth Liner This change will add in the custom _defconfig's to the buildroot makefile so that when a _defconfig is in the custom directory it is recognized correctly, and is able to be used. Signed-off-by: Elizabeth Liner Signed-off-by: Patrick Williams --- Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Makefile b/Makefile index 63502d0..15ef194 100644 --- a/Makefile +++ b/Makefile @@ -845,6 +845,10 @@ defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$(BR2_EXTERNAL)/configs/$@ \ $< --defconfig=$(BR2_EXTERNAL)/configs/$@ $(CONFIG_CONFIG_IN) +%_defconfig: $(BUILD_DIR)/buildroot-config/conf $(BR2_EXTERNAL)/custom/configs/%_defconfig outputmakefile + @$(COMMON_CONFIG_ENV) BR2_DEFCONFIG=$(BR2_EXTERNAL)/custom/configs/$@ \ + $< --defconfig=$(BR2_EXTERNAL)/custom/configs/$@ $(CONFIG_CONFIG_IN) + savedefconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @$(COMMON_CONFIG_ENV) $< \ --savedefconfig=$(if $(DEFCONFIG),$(DEFCONFIG),$(CONFIG_DIR)/defconfig) \ @@ -984,6 +988,12 @@ ifneq ($(wildcard $(BR2_EXTERNAL)/configs/*_defconfig),) @$(foreach b, $(sort $(notdir $(wildcard $(BR2_EXTERNAL)/configs/*_defconfig))), \ printf " %-35s - Build for %s\\n" $(b) $(b:_defconfig=);) endif +ifneq ($(wildcard $(BR2_EXTERNAL)/custom/configs/*_defconfig),) + @echo + @echo 'User-provided custom configs:' + @$(foreach b, $(sort $(notdir $(wildcard $(BR2_EXTERNAL)/custom/configs/*_defconfig))), \ + printf " %-35s - Build for %s\\n" $(b) $(b:_defconfig=);) +endif @echo release: OUT = buildroot-$(BR2_VERSION)