aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Müller-Klieser <s.mueller-klieser@phytec.de>2014-07-28 10:14:44 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-29 09:57:04 +0100
commit1d9d035f07be1cef2764949d84cecbff7dd428dd (patch)
tree3962b52026adef0dce8470158a95e33d5869db60
parent1e153b1b21276d56144add464d592cd7b96a4ede (diff)
downloadopenembedded-core-contrib-1d9d035f07be1cef2764949d84cecbff7dd428dd.tar.gz
openembedded-core-contrib-1d9d035f07be1cef2764949d84cecbff7dd428dd.tar.bz2
openembedded-core-contrib-1d9d035f07be1cef2764949d84cecbff7dd428dd.zip
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@phytec.de> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 34c0c4e6c7..0d4b10b514 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)