From: Stefan Müller-Klieser Date: Mon, 28 Jul 2014 08:14:44 +0000 (+0200) Subject: cml1: correct diffconfig output format X-Git-Tag: 2015-4~2134 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=1d9d035f07be1cef2764949d84cecbff7dd428dd;p=openembedded-core.git 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. Signed-off-by: Stefan Müller-Klieser Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass index 34c0c4e6c7..0d4b10b514 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)