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.
Signed-off-by: Joshua Lock <[email protected]> --- meta/classes/rootfs-postcommands.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index e184667..56e810f 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -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 \ -- 2.5.5 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
