summaryrefslogtreecommitdiffstats
path: root/meta/classes
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:58:27 +0100
commit6a7b98993350d0d24eae0058ae26ae19cfdf7c4c (patch)
tree0a7cc7dab750a02a46458b94b6edfd336fc49116 /meta/classes
parent21b1cd1c24166afbe3fb9bfc4936d917d366df10 (diff)
downloadpoky-6a7b98993350d0d24eae0058ae26ae19cfdf7c4c.tar.gz
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. (From OE-Core rev: 1d9d035f07be1cef2764949d84cecbff7dd428dd) 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>
Diffstat (limited to 'meta/classes')
-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() {
58 bb.fatal("No config files found. Did you do menuconfig ?\n%s" % e) 58 bb.fatal("No config files found. Did you do menuconfig ?\n%s" % e)
59 59
60 if isdiff: 60 if isdiff:
61 statement = 'diff -Nurp ' + configorig + ' ' + config + '| sed -n "s/^\+//p" >' + fragment 61 statement = 'diff --unchanged-line-format= --old-line-format= --new-line-format="%L"' + configorig + ' ' + config + '>' + fragment
62 subprocess.call(statement, shell=True) 62 subprocess.call(statement, shell=True)
63 63
64 shutil.copy(configorig, config) 64 shutil.copy(configorig, config)