[oe-commits] [openembedded-core] 03/23: rootfs-postcommands: don't write manifest when IMAGE_MANIFEST empty
git at git.openembedded.org
git at git.openembedded.org
Mon Mar 28 14:56:28 UTC 2016
rpurdie pushed a commit to branch master
in repository openembedded-core.
commit 54387be24d6a157574496f1b20b21c7fc2a51d3e
Author: Joshua Lock <joshua.g.lock at intel.com>
AuthorDate: Wed Mar 23 15:37:59 2016 +0000
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.
Signed-off-by: Joshua Lock <joshua.g.lock at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
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 \
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list