diff options
| author | Maciej Borzecki <maciej.borzecki@open-rnd.pl> | 2014-08-14 13:34:24 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-15 18:21:47 +0100 |
| commit | a346777b83669326bed41ca0c5b8c60d642804b2 (patch) | |
| tree | adfbcc4a702d709c258039cb293de1279d0ca7ea | |
| parent | 58bd515fdeeab852a9e36e7071b7e34cf0efafe9 (diff) | |
| download | poky-a346777b83669326bed41ca0c5b8c60d642804b2.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.
(From OE-Core rev: 8c75aa7c30cc5a796962d099896ca2a9a16c3a06)
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>
| -rw-r--r-- | meta/classes/cml1.bbclass | 2 |
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() { | |||
| 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 --unchanged-line-format= --old-line-format= --new-line-format="%L"' + configorig + ' ' + config + '>' + 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) |