[PATCH 0/1] package_ipk.bbclass: Replace empty lines in DESCRIPTION with '.'

[PATCH 0/1] package_ipk.bbclass: Replace empty lines in DESCRIPTION with '.'

[mariano.lopez]

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

This will deal with empty lines in DESCRIPTION while creating ipk packages.

Changes in v2:

- Firts version of this patch would fail do_package_write_ipk task if found an
  empty line in DESCRIPTION, this version will replace an empty line with a '.'
  as suggested by Ross.

The following changes since commit eff56e4f0d59b1d965a68e4f009b7f07717b7edd:

  bitbake: bitbake-user-manual: Fixed special character in -D output (2017-04-03 22:32:02 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib mariano/bug10677v2
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=mariano/bug10677v2

Mariano Lopez (1):
  package_ipk.bbclass: Replace empty lines in DESCRIPTION with '.'

 meta/classes/package_ipk.bbclass | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

-- 
2.10.2

[PATCH 1/1] package_ipk.bbclass: Replace empty lines in DESCRIPTION with '.'

[mariano.lopez]

From: Mariano Lopez <mariano.lopez@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.lopez@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