From: Mariano Lopez <mariano.lo...@linux.intel.com>

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.lo...@linux.intel.com>
---
 meta/classes/package_ipk.bbclass | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index fa47385..c7cec9d 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=' '))
-- 
2.10.2

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to