diff options
| author | Mariano Lopez <mariano.lopez@linux.intel.com> | 2017-04-05 11:46:35 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-08 22:48:04 +0100 |
| commit | 3e678d9b6a9eaeed76ce538d7f6ecf9f423864bc (patch) | |
| tree | fc22a0b9773e66711d5feeac9160622725af9ccc | |
| parent | 7ab0e09de75bfd7e7498bfa72d1f2f5d02a96747 (diff) | |
| download | openembedded-core-3e678d9b6a9eaeed76ce538d7f6ecf9f423864bc.tar.gz openembedded-core-3e678d9b6a9eaeed76ce538d7f6ecf9f423864bc.tar.bz2 openembedded-core-3e678d9b6a9eaeed76ce538d7f6ecf9f423864bc.zip | |
package_ipk.bbclass: Replace empty lines in DESCRIPTION with '.'
opkg uses empty lines as separator for next package and if an ipk file was
packaged with empty lines in DESCRIPTION opkg won't be able to handle such ipk
file, this happens at execution time.
This commit will replace empty lines in DESCRIPTION with a '.' when generating
an ipk package to avoid this issue.
[YOCTO #10677]
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/package_ipk.bbclass | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index fa47385fa8..c7cec9d63d 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -145,7 +145,11 @@ python do_package_ipk () { # We don't limit the width when manually indent, but we do # need the textwrap.fill() to set the initial_indent and # subsequent_indent, so set a large width - ctrlfile.write('%s\n' % textwrap.fill(t.strip(), width=100000, initial_indent=' ', subsequent_indent=' ')) + line = textwrap.fill(t.strip(), + width=100000, + initial_indent=' ', + subsequent_indent=' ') or '.' + ctrlfile.write('%s\n' % line) else: # Auto indent ctrlfile.write('%s\n' % textwrap.fill(description, width=74, initial_indent=' ', subsequent_indent=' ')) |