rootfs-postcommands: don't write manifest when IMAGE_MANIFEST empty

Return early in write_image_manifest () if the IMAGE_MANIFEST
variable is unset. This allows us to prevent writing of the
manifest where we prevent images being created for a recipe by
unsetting IMAGE_FSTYPES.

(From OE-Core rev: 54387be24d6a157574496f1b20b21c7fc2a51d3e)

Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Joshua Lock 2016-03-23 15:37:59 +00:00 committed by Richard Purdie
parent abd5b24ff7
commit 036167693a
1 changed files with 4 additions and 1 deletions

View File

@ -215,12 +215,15 @@ python write_image_manifest () {
link_name = d.getVar('IMAGE_LINK_NAME', True)
manifest_name = d.getVar('IMAGE_MANIFEST', True)
if not manifest_name:
return
pkgs = image_list_installed_packages(d)
with open(manifest_name, 'w+') as image_manifest:
image_manifest.write(format_pkg_list(pkgs, "ver"))
image_manifest.write("\n")
if manifest_name is not None and os.path.exists(manifest_name):
if os.path.exists(manifest_name):
manifest_link = deploy_dir + "/" + link_name + ".manifest"
if os.path.exists(manifest_link):
if d.getVar('RM_OLD_IMAGE', True) == "1" and \