From patchwork Tue Aug 16 05:23:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Lacombe X-Patchwork-Id: 1070342 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 p7G5O1XO018461 for ; Tue, 16 Aug 2011 05:24:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751647Ab1HPFYF (ORCPT ); Tue, 16 Aug 2011 01:24:05 -0400 Received: from mail-gx0-f174.google.com ([209.85.161.174]:43613 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751840Ab1HPFYE (ORCPT ); Tue, 16 Aug 2011 01:24:04 -0400 Received: by gxk21 with SMTP id 21so3604014gxk.19 for ; Mon, 15 Aug 2011 22:24:03 -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=fwnF0GCPohBdAN7JLSUWwjTxhRWRssGoyWqm6+Wh8YE=; b=szFg/73amFbEaMH7k//24iAJlNzEvB4T1sG6fpKBZGz8brfluKjpmPd9dd4k8eirBO z37N4Yehi6XmJbbk+RJSxskPm/IA1AL7N6U6uxyCXBZ/Gy+UDGicmGowY8Os4bmLHtuu +aVlq+SbCkMFUA8LROL2WQce/6jf0DV0YRph8= Received: by 10.236.143.40 with SMTP id k28mr14900540yhj.34.1313472243497; Mon, 15 Aug 2011 22:24:03 -0700 (PDT) Received: from localhost.localdomain (69-165-142-232.dsl.teksavvy.com [69.165.142.232]) by mx.google.com with ESMTPS id q25sm625292yhm.48.2011.08.15.22.24.01 (version=SSLv3 cipher=OTHER); Mon, 15 Aug 2011 22:24:02 -0700 (PDT) From: Arnaud Lacombe To: linux-kbuild@vger.kernel.org Cc: Arnaud Lacombe , Steven Rostedt Subject: [PATCH 3/3] kconfig/streamline_config.pl: merge local{mod, yes}config Date: Tue, 16 Aug 2011 01:23:53 -0400 Message-Id: <1313472233-14094-3-git-send-email-lacombar@gmail.com> X-Mailer: git-send-email 1.7.6.153.g78432 In-Reply-To: <1313472233-14094-1-git-send-email-lacombar@gmail.com> References: <1313472233-14094-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:24:05 +0000 (UTC) The two targets `localmodconfig' and `localyesconfig' only differs from the sed(1) ran on the result of `streamline_config.pl' to convert symbols set to `modules' to `yes'. This conversion can be made directly from the perl script, and thus avoid duplicating the command to generate the configuration. Cc: Steven Rostedt Signed-off-by: Arnaud Lacombe --- scripts/kconfig/Makefile | 18 +----------------- 1 files changed, 1 insertions(+), 17 deletions(-) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 4de8973..ba573fe 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -33,7 +33,7 @@ silentoldconfig: $(obj)/conf $(Q)mkdir -p include/generated $< --$@ $(Kconfig) -localmodconfig: $(obj)/streamline_config.pl $(obj)/conf +localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf $(Q)mkdir -p include/generated $(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config $(Q)if [ -f .config ]; then \ @@ -48,22 +48,6 @@ localmodconfig: $(obj)/streamline_config.pl $(obj)/conf fi $(Q)rm -f .tmp.config -localyesconfig: $(obj)/streamline_config.pl $(obj)/conf - $(Q)mkdir -p include/generated - $(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config - $(Q)sed -i s/=m/=y/ .tmp.config - $(Q)if [ -f .config ]; then \ - cmp -s .tmp.config .config || \ - (mv -f .config .config.old.1; \ - mv -f .tmp.config .config; \ - $(obj)/conf --silentoldconfig $(Kconfig); \ - mv -f .config.old.1 .config.old) \ - else \ - mv -f .tmp.config .config; \ - $(obj)/conf --silentoldconfig $(Kconfig); \ - fi - $(Q)rm -f .tmp.config - # Create new linux.pot file # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files # The symlink is used to repair a deficiency in arch/um