summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/imager/direct.py
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-01-14 14:12:57 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-18 11:47:06 +0000
commit5cd222b19f1a937ecc10de5db04d954d3c11eff5 (patch)
tree6c4b0ceb07b3b48814d43ea65d79000f98728e48 /scripts/lib/wic/imager/direct.py
parent4d5d5dd428e8d8fa0e155988286f3b45f47e1544 (diff)
downloadpoky-5cd222b19f1a937ecc10de5db04d954d3c11eff5.tar.gz
wic: get rid of get_rootfs and set_rootfs
Got rid of get_rootfs and set_rootfs java-like getter and setter. Renamed rootfs to rootfs_dir to be consistent with the name of kickstart parameter --rootfs-dir. (From OE-Core rev: 51ec52a62ce49d1a1a83489379990f78cfe849f9) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/imager/direct.py')
-rw-r--r--scripts/lib/wic/imager/direct.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index 25bab89169..09ff5f828d 100644
--- a/scripts/lib/wic/imager/direct.py
+++ b/scripts/lib/wic/imager/direct.py
@@ -233,7 +233,7 @@ class DirectImageCreator(BaseImageCreator):
233 # get rootfs size from bitbake variable if it's not set in .ks file 233 # get rootfs size from bitbake variable if it's not set in .ks file
234 if not part.size: 234 if not part.size:
235 # and if rootfs name is specified for the partition 235 # and if rootfs name is specified for the partition
236 image_name = part.get_rootfs() 236 image_name = part.rootfs_dir
237 if image_name: 237 if image_name:
238 # Bitbake variable ROOTFS_SIZE is calculated in 238 # Bitbake variable ROOTFS_SIZE is calculated in
239 # Image._get_rootfs_size method from meta/lib/oe/image.py 239 # Image._get_rootfs_size method from meta/lib/oe/image.py
@@ -336,13 +336,13 @@ class DirectImageCreator(BaseImageCreator):
336 336
337 msg += 'The following build artifacts were used to create the image(s):\n' 337 msg += 'The following build artifacts were used to create the image(s):\n'
338 for part in parts: 338 for part in parts:
339 if part.get_rootfs() is None: 339 if part.rootfs_dir is None:
340 continue 340 continue
341 if part.mountpoint == '/': 341 if part.mountpoint == '/':
342 suffix = ':' 342 suffix = ':'
343 else: 343 else:
344 suffix = '["%s"]:' % (part.mountpoint or part.label) 344 suffix = '["%s"]:' % (part.mountpoint or part.label)
345 msg += ' ROOTFS_DIR%s%s\n' % (suffix.ljust(20), part.get_rootfs()) 345 msg += ' ROOTFS_DIR%s%s\n' % (suffix.ljust(20), part.rootfs_dir)
346 346
347 msg += ' BOOTIMG_DIR: %s\n' % self.bootimg_dir 347 msg += ' BOOTIMG_DIR: %s\n' % self.bootimg_dir
348 msg += ' KERNEL_DIR: %s\n' % self.kernel_dir 348 msg += ' KERNEL_DIR: %s\n' % self.kernel_dir