[oe-commits] Maciej Borzecki : cml1.bbclass: fix diffconfig diff command

git at git.openembedded.org git at git.openembedded.org
Fri Aug 15 17:22:16 UTC 2014


Module: openembedded-core.git
Branch: master
Commit: 8c75aa7c30cc5a796962d099896ca2a9a16c3a06
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=8c75aa7c30cc5a796962d099896ca2a9a16c3a06

Author: Maciej Borzecki <maciej.borzecki at open-rnd.pl>
Date:   Thu Aug 14 13:34:24 2014 +0200

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 at open-rnd.pl>
Signed-off-by: Maciek Borzecki <maciek.borzecki at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 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 0d4b10b..b5adc47 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)



More information about the Openembedded-commits mailing list