summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-01-10 19:46:08 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-16 18:01:55 +0000
commit2e05d9709f1308fc95d3406b8a409ea982c5b474 (patch)
tree35e3c283b4d67eae5fbb8b09313257ff52a68af3 /scripts
parent4868bc94b8c4ebcf427ea6d321332d8b8fe6ce4a (diff)
downloadopenembedded-core-contrib-2e05d9709f1308fc95d3406b8a409ea982c5b474.tar.gz
openembedded-core-contrib-2e05d9709f1308fc95d3406b8a409ea982c5b474.tar.bz2
openembedded-core-contrib-2e05d9709f1308fc95d3406b8a409ea982c5b474.zip
direct.py: fix getting image name
part.rootfs_dir was used as an image name in the code. However, when multi-rootfs feature is used this attribute points to the name of the rootfs, e.g. if --rootfs command line is rootfs1=core-image-minimal partf.rootfs_dir is 'rootfs1'. The code also fails when image name is not provided in wic commandline. For example, when wic is called with --rootfs-dir=<path> part.rootfs_dir will contain path and wic will crash trying to call bitbake -e <path> to get value of ROOTFS_SIZE variable. Fixed the code by getting image name properly and checking if it's not a path. [YOCTO #10815] Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/imager/direct.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index 11ec15e33f..52828c10cd 100644
--- a/scripts/lib/wic/imager/direct.py
+++ b/scripts/lib/wic/imager/direct.py
@@ -270,8 +270,8 @@ class DirectImageCreator(BaseImageCreator):
# get rootfs size from bitbake variable if it's not set in .ks file
if not part.size:
# and if rootfs name is specified for the partition
- image_name = part.rootfs_dir
- if image_name:
+ image_name = self.rootfs_dir.get(part.rootfs_dir)
+ if image_name and os.path.sep not in image_name:
# Bitbake variable ROOTFS_SIZE is calculated in
# Image._get_rootfs_size method from meta/lib/oe/image.py
# using IMAGE_ROOTFS_SIZE, IMAGE_ROOTFS_ALIGNMENT,