diff options
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oe/rootfs.py | 6 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/imagefeatures.py | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 7c620e938b..a348b975c2 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
@@ -19,7 +19,7 @@ class Rootfs(object, metaclass=ABCMeta): | |||
19 | self.d = d | 19 | self.d = d |
20 | self.pm = None | 20 | self.pm = None |
21 | self.image_rootfs = self.d.getVar('IMAGE_ROOTFS', True) | 21 | self.image_rootfs = self.d.getVar('IMAGE_ROOTFS', True) |
22 | self.deploy_dir_image = self.d.getVar('DEPLOY_DIR_IMAGE', True) | 22 | self.deploydir = self.d.getVar('IMGDEPLOYDIR', True) |
23 | self.progress_reporter = progress_reporter | 23 | self.progress_reporter = progress_reporter |
24 | 24 | ||
25 | self.install_order = Manifest.INSTALL_ORDER | 25 | self.install_order = Manifest.INSTALL_ORDER |
@@ -182,12 +182,12 @@ class Rootfs(object, metaclass=ABCMeta): | |||
182 | 182 | ||
183 | bb.utils.mkdirhier(self.image_rootfs) | 183 | bb.utils.mkdirhier(self.image_rootfs) |
184 | 184 | ||
185 | bb.utils.mkdirhier(self.deploy_dir_image) | 185 | bb.utils.mkdirhier(self.deploydir) |
186 | 186 | ||
187 | shutil.copytree(postinst_intercepts_dir, intercepts_dir) | 187 | shutil.copytree(postinst_intercepts_dir, intercepts_dir) |
188 | 188 | ||
189 | shutil.copy(self.d.expand("${COREBASE}/meta/files/deploydir_readme.txt"), | 189 | shutil.copy(self.d.expand("${COREBASE}/meta/files/deploydir_readme.txt"), |
190 | self.deploy_dir_image + | 190 | self.deploydir + |
191 | "/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt") | 191 | "/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt") |
192 | 192 | ||
193 | execute_pre_post_process(self.d, pre_process_cmds) | 193 | execute_pre_post_process(self.d, pre_process_cmds) |
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 |