summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMariano Lopez <mariano.lopez@linux.intel.com>2017-04-05 11:46:35 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-10 23:00:42 +0100
commit78971cee155f35181dd3f312880914b464daa515 (patch)
tree8d2e69445a1c4d5831f250967a2d5007f52cc014 /meta
parent7d4fa58c5c612915a11e9faaa88d24d32540f1b6 (diff)
downloadpoky-78971cee155f35181dd3f312880914b464daa515.tar.gz
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] (From OE-Core rev: 3e678d9b6a9eaeed76ce538d7f6ecf9f423864bc) Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package_ipk.bbclass6
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 () {
145 # We don't limit the width when manually indent, but we do 145 # We don't limit the width when manually indent, but we do
146 # need the textwrap.fill() to set the initial_indent and 146 # need the textwrap.fill() to set the initial_indent and
147 # subsequent_indent, so set a large width 147 # subsequent_indent, so set a large width
148 ctrlfile.write('%s\n' % textwrap.fill(t.strip(), width=100000, initial_indent=' ', subsequent_indent=' ')) 148 line = textwrap.fill(t.strip(),
149 width=100000,
150 initial_indent=' ',
151 subsequent_indent=' ') or '.'
152 ctrlfile.write('%s\n' % line)
149 else: 153 else:
150 # Auto indent 154 # Auto indent
151 ctrlfile.write('%s\n' % textwrap.fill(description, width=74, initial_indent=' ', subsequent_indent=' ')) 155 ctrlfile.write('%s\n' % textwrap.fill(description, width=74, initial_indent=' ', subsequent_indent=' '))