summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-17 11:15:14 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-19 17:24:47 +0000
commit1c869a96b2b5f17e32a218ba323cd448497decd0 (patch)
tree133a9490fef89b99220938e71e01824778b46810
parentd27491b6940156a52be4fd4aec32eff3fac4a0d3 (diff)
downloadopenembedded-core-contrib-1c869a96b2b5f17e32a218ba323cd448497decd0.tar.gz
openembedded-core-contrib-1c869a96b2b5f17e32a218ba323cd448497decd0.tar.bz2
openembedded-core-contrib-1c869a96b2b5f17e32a218ba323cd448497decd0.zip
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. (From OE-Core rev: fc951851a0e172641e2f24a4edce87ca2eb5cecd) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/rootfs-postcommands.bbclass3
1 files changed, 3 insertions, 0 deletions
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)
}