From patchwork Thu Jul 14 02:41:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnaud Lacombe X-Patchwork-Id: 973972 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6E2fiLS005685 for ; Thu, 14 Jul 2011 02:41:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753439Ab1GNClp (ORCPT ); Wed, 13 Jul 2011 22:41:45 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:38379 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753437Ab1GNClo (ORCPT ); Wed, 13 Jul 2011 22:41:44 -0400 Received: by pzk9 with SMTP id 9so5257277pzk.19 for ; Wed, 13 Jul 2011 19:41:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=XSzTl088e91lRIjEqXzO+0CBFCQgf0gnsGkNgpYjiT4=; b=r+NyEeai2wzJviFuA34apnNbbDF8xBV7M1CPYSiFLo0XzAE40GiVyg4QLkU+UmaKrk CxE9+hKFATj9ccp2TBtiAkvaAtKUZr91O5p9BpHP5l2TFywXnJYJ2kjnLteKS6AmhoLr rA97KD6DXzPB2dhNrBgePnpmCrkPzjOZNx6JE= MIME-Version: 1.0 Received: by 10.68.54.6 with SMTP id f6mr2102631pbp.139.1310611304254; Wed, 13 Jul 2011 19:41:44 -0700 (PDT) Received: by 10.68.49.42 with HTTP; Wed, 13 Jul 2011 19:41:44 -0700 (PDT) In-Reply-To: <1310604899.27864.4.camel@gandalf.stny.rr.com> References: <1309563076-5050-1-git-send-email-lacombar@gmail.com> <1310170759.2780.37.camel@fedora> <1310604899.27864.4.camel@gandalf.stny.rr.com> Date: Wed, 13 Jul 2011 22:41:44 -0400 Message-ID: Subject: Re: [RFC 0/4] streamline_config clean-ups From: Arnaud Lacombe To: Steven Rostedt Cc: Steven Rostedt , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, Michal Marek 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 (demeter1.kernel.org [140.211.167.41]); Thu, 14 Jul 2011 02:41:45 +0000 (UTC) Hi, On Wed, Jul 13, 2011 at 8:54 PM, Steven Rostedt wrote: > On Fri, 2011-07-08 at 20:19 -0400, Steven Rostedt wrote: >> On Fri, 2011-07-08 at 17:47 -0400, Arnaud Lacombe wrote: >> > Hi, >> > >> > On Fri, Jul 1, 2011 at 7:31 PM, Arnaud Lacombe wrote: >> > > Hi, >> > > >> > > The following series attempts to merge some redundants stuff in the kconfig >> > > Makefile, namely how streamline_config learns about its environment, avoids >> > > multi-line shell command in kconfig's Makefile. Seconds commit also removes the >> > > non-portable usage of sed(1) as -i is not POSIX compliant. >> > > >> > > Comments appreciated! >> > > >> > >  - Arnaud >> > > >> > Ping ? > > I just tried your patches out. It breaks when we compile for another > directory. I just tried: > > $ make LSMOD=/tmp/lsmod O=../machine/build/ localmodconfig > > and it it did not work. > yes... it could not have. I missed a $(srctree), an export, and an error check. Attached patch should fix it, behavior (see below) with this patch is consistent between v3.0-rc6 and the tip of the patched branch. Btw, as of v3.0-rc6, localmodconfig does not produce a valid .config. Local kernel is a Fedora 14 kernel, based on config-2.6.35.13-91.fc14.x86_64. The perl script complete fine, but the config is then restarted, I'm not sure if it is the intended behavior. - Arnaud From d6e7caf197c10b448da873c27cf5ef89f9bcf4b2 Mon Sep 17 00:00:00 2001 From: Arnaud Lacombe Date: Wed, 13 Jul 2011 22:29:24 -0400 Subject: [PATCH] fix --- scripts/kconfig/Makefile | 4 +++- scripts/kconfig/localconfig.sh | 2 ++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index d48ddc9..1bf4375 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -11,6 +11,8 @@ else Kconfig := Kconfig endif +export Kconfig + xconfig: $(obj)/qconf $< $(Kconfig) @@ -34,7 +36,7 @@ silentoldconfig: $(obj)/conf $< --$@ $(Kconfig) localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf - $(Q)$(src)/localconfig.sh + $(Q)$(srctree)/$(src)/localconfig.sh # Create new linux.pot file # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files diff --git a/scripts/kconfig/localconfig.sh b/scripts/kconfig/localconfig.sh index 64dd295..f8185fb 100755 --- a/scripts/kconfig/localconfig.sh +++ b/scripts/kconfig/localconfig.sh @@ -1,6 +1,8 @@ #!/bin/sh # +set -e + mkdir -p include/generated perl "${srctree}/scripts/kconfig/streamline_config.pl" ${srctree}/ ${Kconfig} $1 > .tmp.config -- 1.7.3.4.574.g608b.dirty