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.
Signed-off-by: Stefan Müller-Klieser <[email protected]> --- meta/classes/cml1.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass index 34c0c4e..0d4b10b 100644 --- a/meta/classes/cml1.bbclass +++ b/meta/classes/cml1.bbclass @@ -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) -- 1.9.1 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
