From: Maciej Borzecki Date: Thu, 14 Aug 2014 11:34:24 +0000 (+0200) Subject: cml1.bbclass: fix diffconfig diff command X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~32797 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c75aa7c30cc5a796962d099896ca2a9a16c3a06;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git cml1.bbclass: fix diffconfig diff command Commit 6a7b98993350d0d24eae0058ae26ae19cfdf7c4c introduced a typo in command, a whitespace was missing between --new-line-format and path to original file. As a result, diffconfig task did not work, diff failed with exit status 2, resulting in empty fragment.cfg. Signed-off-by: Maciej Borzecki Signed-off-by: Maciek Borzecki Signed-off-by: Richard Purdie --- diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass index 0d4b10b5145..b5adc477167 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 --unchanged-line-format= --old-line-format= --new-line-format="%L"' + configorig + ' ' + config + '>' + 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)