From patchwork Fri Sep 11 19:59:03 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 46992 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8BK45iQ008614 for ; Fri, 11 Sep 2009 20:04:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756387AbZIKUBm (ORCPT ); Fri, 11 Sep 2009 16:01:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756341AbZIKUAp (ORCPT ); Fri, 11 Sep 2009 16:00:45 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.124]:53812 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756278AbZIKUAd (ORCPT ); Fri, 11 Sep 2009 16:00:33 -0400 Received: from gandalf.stny.rr.com ([74.67.89.75]) by hrndva-omta02.mail.rr.com with ESMTP id <20090911200036970.XKBB28062@hrndva-omta02.mail.rr.com>; Fri, 11 Sep 2009 20:00:36 +0000 Received: from rostedt by gandalf.stny.rr.com with local (Exim 4.69) (envelope-from ) id 1MmCIO-0005uy-I4; Fri, 11 Sep 2009 16:00:36 -0400 Message-Id: <20090911200036.384527834@goodmis.org> References: <20090911195849.451244684@goodmis.org> User-Agent: quilt/0.46-1 Date: Fri, 11 Sep 2009 15:59:03 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Linus Torvalds , Andrew Morton , Ingo Molnar , Thomas Gleixner , Theodore Tso , Arnaldo Carvalho de Melo , zippel@linux-m68k.org, linux-kbuild@vger.kernel.org, Sam Ravnborg , Dick Streefland , Stephen Rothwell Subject: [PATCH 14/15] kconfig: test if a .config already exists Content-Disposition: inline; filename=0014-kconfig-test-if-a-.config-already-exists.patch Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org From: Steven Rostedt If one were to run localmodconfig or localyesconfig without having a .config already in the file, then the end of the process would give a warning when it tries to move the old .config to .config.old. This patch adds a test to check if .config exists and avoid the moves if it does not. [ Impact: remove warning after make localmodconfig ] Signed-off-by: Steven Rostedt --- scripts/kconfig/Makefile | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 12a4d9e..915a39a 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -31,21 +31,31 @@ silentoldconfig: $(obj)/conf localmodconfig: $(obj)/streamline_config.pl $(obj)/conf $(Q)perl $< $(Kconfig) > .tmp.config - $(Q)cmp -s .tmp.config .config || \ - (mv -f .config .config.old.1; \ - mv -f .tmp.config .config; \ - $(obj)/conf -s $(Kconfig); \ - mv -f .config.old.1 .config.old) + $(Q)if [ -f .config ]; then \ + cmp -s .tmp.config .config || \ + (mv -f .config .config.old.1; \ + mv -f .tmp.config .config; \ + $(obj)/conf -s $(Kconfig); \ + mv -f .config.old.1 .config.old) \ + else \ + mv -f .tmp.config .config; \ + $(obj)/conf -s $(Kconfig); \ + fi $(Q)rm -f .tmp.config localyesconfig: $(obj)/streamline_config.pl $(Q)perl $< $(Kconfig) > .tmp.config $(Q)sed -i s/=m/=y/ .tmp.config - $(Q)cmp -s .tmp.config .config || \ - (mv -f .config .config.old.1; \ - mv -f .tmp.config .config; \ - $(obj)/conf -s $(Kconfig); \ - mv -f .config.old.1 .config.old) + $(Q)if [ -f .config ]; then \ + cmp -s .tmp.config .config || \ + (mv -f .config .config.old.1; \ + mv -f .tmp.config .config; \ + $(obj)/conf -s $(Kconfig); \ + mv -f .config.old.1 .config.old) \ + else \ + mv -f .tmp.config .config; \ + $(obj)/conf -s $(Kconfig); \ + fi $(Q)rm -f .tmp.config # Create new linux.pot file