From 93631befe8b962bf99524746b49f4ebca336175c Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Wed, 12 Oct 2016 21:46:41 +0100 Subject: Remove RM_OLD_IMAGE, it's no longer useful Since the move to put image deployment under sstate control in d54339d4b1a7e884de636f6325ca60409ebd95ff old images are automatically removed before a new image is deployed (the default behaviour of the sstate logic). RM_OLD_IMAGE is therefore no longer required to provide this behaviour, remove the variable and its users. Signed-off-by: Joshua Lock Signed-off-by: Ross Burton --- meta/classes/cve-check.bbclass | 2 -- 1 file changed, 2 deletions(-) (limited to 'meta/classes/cve-check.bbclass') diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 8251ca7c97..1425a40554 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -92,8 +92,6 @@ python cve_check_write_rootfs_manifest () { manifest_link = os.path.join(deploy_dir, "%s.cve" % link_name) # If we already have another manifest, update symlinks if os.path.exists(os.path.realpath(manifest_link)): - if d.getVar('RM_OLD_IMAGE', True) == "1": - os.remove(os.path.realpath(manifest_link)) os.remove(manifest_link) os.symlink(os.path.basename(manifest_name), manifest_link) bb.plain("Image CVE report stored in: %s" % manifest_name) -- cgit v1.2.3