linux-config.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "John Lumby" <johnlumby@hotmail.com>
To: linux-config@vger.kernel.org
Subject: Re: merge two kernel .config 's into one union of the two
Date: Sat, 01 Jul 2006 12:32:42 -0400	[thread overview]
Message-ID: <BAY108-F89156B2947BF9F5F92966A3720@phx.gbl> (raw)
In-Reply-To: <Pine.LNX.4.58.0606291240490.4485@yossarian.aniota.com>

>From: terry white <twhite@aniota.com>
>: on "6-29-2006" "John Lumby" writ:
>: but also (of course) a valid .config
>
>    i'm not sure that a trivial task.
>
>: suggest any method at all for achieving this?
>
>     i use the following to find differences in .config files.  it assumes
>those copied to "config-[0-9]*".  typically, '[0-9]*' a two digit minor
>version number.  you might want to tweak to taste.
>
>fgrep -v \# config-[0-9]* | sort -t ":" -k 2,2 \
>| uniq -s 10 -u | sort > config.diff
>
Thanks Terry - that's a useful script and using that I got a lot closer to 
completing the merge.    I was finally able to use one of the configs  in 
make xconfig, and then use the output of your diff in another window to add 
in the missing functions from the other config.

And to repay the help, here's part of a script I wrote whose purpose is, 
given the name of a config parm, to print out the name of the corresponding 
kernel source file and the help for the parm:

find . -name Kconfig -exec ksh_c 'pline="";fl=' {} ';egrep -e "^config 
'"${cparm}"'" $fl && echo " from $fl" && sed -ne "/^config 
'"${cparm}"'/,/^config/ p" $fl| while read line; do { print -- "$pline"; 
pline="$line"; };done' \;

ksh_c is an executable which simply glues all its parms together into one 
string and passes it to ksh using ksh -c "string", which is useful when run 
from inside the -exec option of find.



      reply	other threads:[~2006-07-01 16:32 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <S1751243AbWF2STT/20060629181919Z+5@vger.kernel.org>
2006-06-29 18:30 ` merge two kernel .config 's into one union of the two John Lumby
2006-06-29 19:54   ` terry white
2006-07-01 16:32     ` John Lumby [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=BAY108-F89156B2947BF9F5F92966A3720@phx.gbl \
    --to=johnlumby@hotmail.com \
    --cc=linux-config@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).