From patchwork Sat Apr 28 17:14:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 155675 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 A8805B6FE2 for ; Sun, 29 Apr 2012 03:15:09 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 175B831EF6; Sat, 28 Apr 2012 17:15:07 +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 3IEB4r2F0VHx; Sat, 28 Apr 2012 17:15:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id F326031A46; Sat, 28 Apr 2012 17:15:02 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 750848F753 for ; Sat, 28 Apr 2012 17:15:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6AB058C6CB for ; Sat, 28 Apr 2012 17:15:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "Cc" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id G9dkyZH-adcM for ; Sat, 28 Apr 2012 17:15:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from viper.mind.be (132.79-246-81.adsl-static.isp.belgacom.be [81.246.79.132]) by whitealder.osuosl.org (Postfix) with ESMTPS id 106FB8C978 for ; Sat, 28 Apr 2012 17:15:00 +0000 (UTC) Received: from [172.16.2.6] (helo=vandecaa-laptop) by viper.mind.be with esmtp (Exim 4.69) (envelope-from ) id 1SOBEU-0002J1-N2; Sat, 28 Apr 2012 19:14:58 +0200 Received: from arnout by vandecaa-laptop with local (Exim 4.77) (envelope-from ) id 1SOBET-0002Hb-77; Sat, 28 Apr 2012 19:14:53 +0200 From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@busybox.net Date: Sat, 28 Apr 2012 19:14:50 +0200 Message-Id: <1335633290-8734-1-git-send-email-arnout@mind.be> X-Mailer: git-send-email 1.7.10 Subject: [Buildroot] [PATCH v3 resend] config: make it possible to specify which config file to use for 'make defconfig' 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 So that this works: % make defconfig BR2_DEFCONFIG=~/buildroot-defconfig Right now we have to do: % cp ~/buildroot-defconfig configs/buildroot_defconfig % make buildroot_defconfig That would dirty the buildroot tree and requires it to be writable. Signed-off-by: Felipe Contreras Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Acked-by: Luca Ceresoli Acked-by: Thomas Petazzoni --- v3: * Acked by ThomasP v2: * Use $(if...) instead of $(patsubst...) * Add help text * Fix commit message Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cc8124a..a7625ba 100644 --- a/Makefile +++ b/Makefile @@ -540,7 +540,7 @@ silentoldconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile defconfig: $(BUILD_DIR)/buildroot-config/conf outputmakefile @mkdir -p $(BUILD_DIR)/buildroot-config - @$(COMMON_CONFIG_ENV) $< --defconfig $(CONFIG_CONFIG_IN) + @$(COMMON_CONFIG_ENV) $< --defconfig$(if $(BR2_DEFCONFIG),=$(BR2_DEFCONFIG)) $(CONFIG_CONFIG_IN) %_defconfig: $(BUILD_DIR)/buildroot-config/conf $(TOPDIR)/configs/%_defconfig outputmakefile @mkdir -p $(BUILD_DIR)/buildroot-config @@ -603,6 +603,7 @@ help: @echo ' oldconfig - resolve any unresolved symbols in .config' @echo ' randconfig - New config with random answer to all options' @echo ' defconfig - New config with default answer to all options' + @echo ' BR2_DEFCONFIG, if set, is used as input' @echo ' savedefconfig - Save current config as ./defconfig (minimal config)' @echo ' allyesconfig - New config where all options are accepted with yes' @echo ' allnoconfig - New config where all options are answered with no'