linux-kernel - Re: What about make mergeconfig ?

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 26 Oct 2006 13:25:26 +0200 (MEST)
From:	Jan Engelhardt <jengelh@...ux01.gwdg.de>
To:	Geert Uytterhoeven <geert@...ux-m68k.org>
cc:	Dick Streefland <dick.streefland@...ium.nl>,
	Linux Kernel Development <linux-kernel@...r.kernel.org>,
	sam@...nborg.org
Subject: Re: What about make mergeconfig ?

>> >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?

I take it we do not want to depend on too many tools (remember the 
kconfig implementation language debate).

>merge -p other.config .config.old .config > other.config.new

This also does not seem conflict-safe.


	-`J'
-- 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/