From 6a7b98993350d0d24eae0058ae26ae19cfdf7c4c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20M=C3=BCller-Klieser?= Date: Mon, 28 Jul 2014 10:14:44 +0200 Subject: [PATCH] cml1: correct diffconfig output format MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- 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 34c0c4e6c74..0d4b10b5145 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) -- 2.47.2