Skip to contentSkip to conversation

package_ipk.bbclass: Replace empty lines in DESCRIPTION with '.'

PATCH New [email protected] 1 participant 2 messages Apr 5, 2017

lore
Share & tools
lore
#0 lore raw

cover package_ipk.bbclass: Replace empty lines in DESCRIPTION with '.'

From: Mariano Lopez <[email protected]>

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(-)
Signature · 1 line
2.10.2
#1 lore raw

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

From: Mariano Lopez <[email protected]>

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]

---
 meta/classes/package_ipk.bbclass | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta/classes/package_ipk.bbclass +5 -1
index fa47385..c7cec9d 100644
@@ -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=' '))
Signature · 1 line
2.10.2