lkml.org 
[lkml]   [2006]   [Oct]   [26]   [last100]   RSS Feed
Views: [more markup]  [less markup]  [headers]  [forward] 
 
Messages in this thread
/
DateThu, 26 Oct 2006 11:03:45 +0200 (CEST)
FromGeert Uytterhoeven <>
SubjectRe: What about make mergeconfig ?
On Thu, 26 Oct 2006, Jan Engelhardt wrote:
> >| >Can't you do that with just a sort command?> >| >> >| >  sort .config other.config > new.config> >| > >| That does not work where .config and other.config have the same symbol 
> >| listed, kconfig will bark and use the first value encountered. Because I 
> >| do have exactly that problem with my patch series (changes some Ys to 
> >| Ms), I am in need of the following patch to Kconfig TDTRT.> >> >Or you can use the following hack:> >> >  (sort .config other.config; echo set) | sh | grep ^CONFIG_ > new.config> > That does not properly deal with "# CONFIG_XYZ is not set" lines in 
> other.config.

What about RCS merge?

merge -p other.config .config.old .config > other.config.new
Gr{oetje,eeting}s,
						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2006-10-26 11:09    [from the cache]
©2003-2008