From patchwork Tue Aug 16 05:34:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Lacombe X-Patchwork-Id: 1070422 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7G5Z1wS003231 for ; Tue, 16 Aug 2011 05:35:02 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753211Ab1HPFeq (ORCPT ); Tue, 16 Aug 2011 01:34:46 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:61644 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752921Ab1HPFe3 (ORCPT ); Tue, 16 Aug 2011 01:34:29 -0400 Received: by mail-yw0-f46.google.com with SMTP id 7so3567555ywf.19 for ; Mon, 15 Aug 2011 22:34:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=aWoLK2oZFk1jwgvvKTz5vkOV6L5GRcU1jxqUFQhdi2E=; b=bz1xjOKckJ4YC0HHxJdXPfm9wFDPy6uNt4WEQ9VtCEZTzo9+5xKDxHlkfaFiU1VewB OsNpsDhZkvdXTUKrBBgzLNWm7aV+DJIzV/yjCIpdMAA3Ff878swQ1ULLWcbnYx0m6hfD urQn2biLAgYjHvM4VSUktz+CgjmTJR4wnBE8E= Received: by 10.150.74.10 with SMTP id w10mr5619185yba.224.1313472869541; Mon, 15 Aug 2011 22:34:29 -0700 (PDT) Received: from localhost.localdomain (69-165-142-232.dsl.teksavvy.com [69.165.142.232]) by mx.google.com with ESMTPS id e21sm985275yhn.77.2011.08.15.22.34.28 (version=SSLv3 cipher=OTHER); Mon, 15 Aug 2011 22:34:28 -0700 (PDT) From: Arnaud Lacombe To: Michal Marek Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, Arnaud Lacombe Subject: [PATCH 4/4] kconfig: do not hardcode .config Date: Tue, 16 Aug 2011 01:34:14 -0400 Message-Id: <1313472854-14426-5-git-send-email-lacombar@gmail.com> X-Mailer: git-send-email 1.7.6.153.g78432 In-Reply-To: <1313472854-14426-1-git-send-email-lacombar@gmail.com> References: <1313472854-14426-1-git-send-email-lacombar@gmail.com> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 16 Aug 2011 05:35:02 +0000 (UTC) Signed-off-by: Arnaud Lacombe --- scripts/kconfig/Makefile | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index dabb4f1..a86924b 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -10,6 +10,8 @@ KCONFIG_CONFIG ?= .config KCONFIG_DEFCONFIG ?= export KCONFIG_CONFIG +dot-config := $(KCONFIG_CONFIG) + xconfig: $(obj)/qconf $< $(Kconfig) @@ -43,14 +45,14 @@ endif localmodconfig: $(obj)/streamline_config.pl $(obj)/conf $(Q)mkdir -p include/generated $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config - $(Q)if [ -f .config ]; then \ - cmp -s .tmp.config .config || \ - (mv -f .config .config.old.1; \ - mv -f .tmp.config .config; \ + $(Q)if [ -f $(dot-config) ]; then \ + cmp -s .tmp.config .$(dot-config) || \ + (mv -f $(dot-config) $(dot-config).old.1; \ + mv -f .tmp.config $(dot-config); \ $(obj)/conf --silentoldconfig $(Kconfig); \ - mv -f .config.old.1 .config.old) \ + mv -f $(dot-config).old.1 $(dot-config).old) \ else \ - mv -f .tmp.config .config; \ + mv -f .tmp.config $(dot-config); \ $(obj)/conf --silentoldconfig $(Kconfig); \ fi $(Q)rm -f .tmp.config @@ -126,7 +128,7 @@ help: @echo ' menuconfig - Update current config utilising a menu based program' @echo ' xconfig - Update current config utilising a QT based front-end' @echo ' gconfig - Update current config utilising a GTK based front-end' - @echo ' oldconfig - Update current config utilising a provided .config as base' + @echo ' oldconfig - Update current config utilising a provided $(dot-config) as base' @echo ' localmodconfig - Update current config disabling modules not loaded' @echo ' localyesconfig - Update current config converting local mods to core' @echo ' silentoldconfig - Same as oldconfig, but quietly, additionally update deps'