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): self.d = d self.pm = None self.image_rootfs = self.d.getVar('IMAGE_ROOTFS', True) - self.deploy_dir_image = self.d.getVar('DEPLOY_DIR_IMAGE', True) + self.deploydir = self.d.getVar('IMGDEPLOYDIR', True) self.progress_reporter = progress_reporter self.install_order = Manifest.INSTALL_ORDER @@ -182,12 +182,12 @@ class Rootfs(object, metaclass=ABCMeta): bb.utils.mkdirhier(self.image_rootfs) - bb.utils.mkdirhier(self.deploy_dir_image) + bb.utils.mkdirhier(self.deploydir) shutil.copytree(postinst_intercepts_dir, intercepts_dir) shutil.copy(self.d.expand("${COREBASE}/meta/files/deploydir_readme.txt"), - self.deploy_dir_image + + self.deploydir + "/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt") 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): image_name = 'core-image-minimal' bitbake(image_name) - deploy_dir = get_bb_var('DEPLOY_DIR_IMAGE') + deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE') link_name = get_bb_var('IMAGE_LINK_NAME', image_name) - image_path = os.path.join(deploy_dir, "%s.ext4" % link_name) + image_path = os.path.join(deploy_dir_image, "%s.ext4" % link_name) bmap_path = "%s.bmap" % image_path # check if result image and bmap file are in deploy directory |