On Thu, Jan 06, 2011 at 07:21:29PM -0800, JD wrote:
On 01/06/2011 01:23 PM, Jarod Wilson wrote:
> On Thu, Jan 06, 2011 at 01:13:41PM -0800, JD wrote:
> ...
> ...
>> Would this loop in the spec file do it?
>> .
>> .
>> for i in %{all_arch_configs}
>> do
>> mv $i $i.tmp
>> ./merge.pl %{Source1000} $i.tmp> $i
>> rm $i.tmp
>> done
> Yep. In other words, use the exact same for loop that's already there
> inside the '%if 0%{?rhel}' clause, just without the clause and with the
> overlay file instead of config-rhel-generic. :)
>
Hi Jarod.
I tried it and it failed miserably.
In fact, it does not overwrite the config values in the source tree with
the config values in config-local.
When it started building for my i686 platform,
I peeked into the .config file in the source tree.
It had ignored my settings completely!
So, I think we need to go back to the drawing board to find a way
that really gives the builder his chosed config items via the rpmbuild
method.
I just implemented exactly what I described here locally, and it worked
perfectly. The config-local file needs to be a Source: file so that it
actually gets included in the source rpm, and I'm not sure why you're
doing anything touching debuginfo bits...
My test case was to simply add CONFIG_VIDEO_VIA_CAMERA=y to my
config-local, as I know its disabled in the stock config, because it
doesn't build (due to a dependency on updated viafb bits in 2.6.37). I
created a source rpm with that modified config-local, then did an
rpmbuild, and it failed on drivers/media/video/via-camera.c exactly like
I'd expected it to. So I suspect you've either done something wrong with
your implementation or you execution. :)
--
Jarod Wilson
jarod(a)redhat.com