[oe-commits] Stefan Müller-Kliese =?UTF-8?Q?r=20?=: cml1: correct diffconfig output format

[git at git.openembedded.org]

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

Author: Stefan Müller-Klieser <s.mueller-klieser at phytec.de>
Date:   Mon Jul 28 10:14:44 2014 +0200

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 <s.mueller-klieser at phytec.de>
Signed-off-by: Saul Wold <sgw at linux.intel.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 34c0c4e..0d4b10b 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)