summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/selftest/imagefeatures.py
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-09-01 11:56:00 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-04 00:07:28 +0100
commit9cc449273252314fdc88cd62deb18a3e03d8abd5 (patch)
tree7be59be75f83dc27aaf1cc8b1e816bce1f03c434 /meta/lib/oeqa/selftest/imagefeatures.py
parent619d2996fbb12e6ab63daa73b2d9683023cc2744 (diff)
downloadpoky-9cc449273252314fdc88cd62deb18a3e03d8abd5.tar.gz
image: Deploy images to IMGDEPLOYDIR
Changed deployment directory from DEPLOY_DIR_IMAGE to IMGDEPLOYDIR to make sstate machinery to do final deployment and generate manifest. Renamed variable deploy_dir to deploy_dir_image in selftest code to avoid confusion with DEPLOYDIR variable. Updated the code of rootfs.py:Rootfs class to use IMGDEPLOYDIR variable as it's now used as a new deployment destination. (From OE-Core rev: 6d969bacc718e21a5246d4da9bf9639dcae29b02) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/selftest/imagefeatures.py')
-rw-r--r--meta/lib/oeqa/selftest/imagefeatures.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/imagefeatures.py b/meta/lib/oeqa/selftest/imagefeatures.py
index 08e382f2b7..d015c49087 100644
--- a/meta/lib/oeqa/selftest/imagefeatures.py
+++ b/meta/lib/oeqa/selftest/imagefeatures.py
@@ -113,9 +113,9 @@ class ImageFeatures(oeSelfTest):
113 image_name = 'core-image-minimal' 113 image_name = 'core-image-minimal'
114 bitbake(image_name) 114 bitbake(image_name)
115 115
116 deploy_dir = get_bb_var('DEPLOY_DIR_IMAGE') 116 deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE')
117 link_name = get_bb_var('IMAGE_LINK_NAME', image_name) 117 link_name = get_bb_var('IMAGE_LINK_NAME', image_name)
118 image_path = os.path.join(deploy_dir, "%s.ext4" % link_name) 118 image_path = os.path.join(deploy_dir_image, "%s.ext4" % link_name)
119 bmap_path = "%s.bmap" % image_path 119 bmap_path = "%s.bmap" % image_path
120 120
121 # check if result image and bmap file are in deploy directory 121 # check if result image and bmap file are in deploy directory