aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMaciej Borzecki <maciej.borzecki@open-rnd.pl>2014-08-14 13:34:24 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-15 08:46:41 +0100
commit8c75aa7c30cc5a796962d099896ca2a9a16c3a06 (patch)
tree7054370573f13f7da025125b637f2b0e2b8ed2f6 /meta
parent32e95316db40d20bb2aa7dd48e35114f3ea7a0ee (diff)
downloadopenembedded-core-contrib-8c75aa7c30cc5a796962d099896ca2a9a16c3a06.tar.gz
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 <maciej.borzecki@open-rnd.pl> Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/cml1.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass
index 0d4b10b514..b5adc47716 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)