From fc951851a0e172641e2f24a4edce87ca2eb5cecd Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 17 Jan 2016 11:15:14 +0000 Subject: rootfs-postcommands: Ensure license manifests respect RM_OLD_IMAGE When RM_OLD_IMAGE is set, old manifest files should be removed along with old image files and our QA tests expect this. This patch ensures this happens. Signed-off-by: Richard Purdie --- meta/classes/rootfs-postcommands.bbclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index 96d3051429..970e9f34b1 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -219,6 +219,9 @@ python write_image_manifest () { if manifest_name is not None and 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 \ + os.path.exists(os.path.realpath(manifest_link)): + os.remove(os.path.realpath(manifest_link)) os.remove(manifest_link) os.symlink(os.path.basename(manifest_name), manifest_link) } -- cgit 1.2.3-korg