summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/rootfs-postcommands.bbclass1
-rw-r--r--meta/lib/oe/utils.py8
2 files changed, 7 insertions, 2 deletions
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass
index e816824..bde58ad 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -253,7 +253,6 @@ python write_image_manifest () {
253 pkgs = image_list_installed_packages(d) 253 pkgs = image_list_installed_packages(d)
254 with open(manifest_name, 'w+') as image_manifest: 254 with open(manifest_name, 'w+') as image_manifest:
255 image_manifest.write(format_pkg_list(pkgs, "ver")) 255 image_manifest.write(format_pkg_list(pkgs, "ver"))
256 image_manifest.write("\n")
257 256
258 if os.path.exists(manifest_name): 257 if os.path.exists(manifest_name):
259 manifest_link = deploy_dir + "/" + link_name + ".manifest" 258 manifest_link = deploy_dir + "/" + link_name + ".manifest"
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index 93b0763..d05f517 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -347,7 +347,13 @@ def format_pkg_list(pkg_dict, ret_format=None):
347 for pkg in sorted(pkg_dict): 347 for pkg in sorted(pkg_dict):
348 output.append(pkg) 348 output.append(pkg)
349 349
350 return '\n'.join(output) 350 output_str = '\n'.join(output)
351
352 if output_str:
353 # make sure last line is newline terminated
354 output_str += '\n'
355
356 return output_str
351 357
352def host_gcc_version(d, taskcontextonly=False): 358def host_gcc_version(d, taskcontextonly=False):
353 import re, subprocess 359 import re, subprocess