mirror of
https://git.yoctoproject.org/poky
synced 2026-04-20 00:32:13 +02:00
cml1: correct diffconfig output format
If used with some packages using kconfig mechanism, the diffconfig command generates wrong output format. Diff provides all options to format the output correctly. This method formats as intended, is more robust and works with the merge_config.h script from yocto-kernel-tools. (From OE-Core rev: 1d9d035f07be1cef2764949d84cecbff7dd428dd) Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
21b1cd1c24
commit
6a7b989933
@@ -58,7 +58,7 @@ python do_diffconfig() {
|
||||
bb.fatal("No config files found. Did you do menuconfig ?\n%s" % e)
|
||||
|
||||
if isdiff:
|
||||
statement = 'diff -Nurp ' + configorig + ' ' + config + '| sed -n "s/^\+//p" >' + fragment
|
||||
statement = 'diff --unchanged-line-format= --old-line-format= --new-line-format="%L"' + configorig + ' ' + config + '>' + fragment
|
||||
subprocess.call(statement, shell=True)
|
||||
|
||||
shutil.copy(configorig, config)
|
||||
|
||||
Reference in New Issue
Block a user