Hi,
On Wed, Jul 13, 2011 at 8:54 PM, Steven Rostedt <rostedt@xxxxxxxxxxx> 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 <lacombar@xxxxxxxxx> 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 <lacombar@xxxxxxxxx>
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
