summaryrefslogtreecommitdiffstats
path: root/scripts/lib/mic/imager
diff options
context:
space:
mode:
authorJoão Henrique Ferreira de Freitas <joaohf@gmail.com>2014-03-29 00:12:07 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-30 10:10:35 +0100
commit3c0038488491374e745ebcfbd091c3f28cc8c089 (patch)
treef4f648636ff10efb3573bf8677e5ee24c1ea88e9 /scripts/lib/mic/imager
parent13afd358682b8edc5c6a33f64ab32977030bfd65 (diff)
downloadast2050-yocto-poky-3c0038488491374e745ebcfbd091c3f28cc8c089.zip
ast2050-yocto-poky-3c0038488491374e745ebcfbd091c3f28cc8c089.tar.gz
wic: Report all ROOTFS_DIR artifacts
When a .wks has more than one ROOTFS_DIR it's better to report all ROOTFS_DIR that was used to create the image. (From OE-Core rev: a8762f3be215678a6806cabe49647083f42323a8) Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/mic/imager')
-rw-r--r--scripts/lib/mic/imager/direct.py18
1 files changed, 14 insertions, 4 deletions
diff --git a/scripts/lib/mic/imager/direct.py b/scripts/lib/mic/imager/direct.py
index 1f2f8fc..ac63c38 100644
--- a/scripts/lib/mic/imager/direct.py
+++ b/scripts/lib/mic/imager/direct.py
@@ -321,15 +321,25 @@ class DirectImageCreator(BaseImageCreator):
"""
msg = "The new image(s) can be found here:\n"
+ parts = self._get_parts()
+
for disk_name, disk in self.__instimage.disks.items():
full_path = self._full_path(self.__imgdir, disk_name, "direct")
msg += ' %s\n\n' % full_path
msg += 'The following build artifacts were used to create the image(s):\n'
- msg += ' ROOTFS_DIR: %s\n' % self.rootfs_dir
- msg += ' BOOTIMG_DIR: %s\n' % self.bootimg_dir
- msg += ' KERNEL_DIR: %s\n' % self.kernel_dir
- msg += ' NATIVE_SYSROOT: %s\n' % self.native_sysroot
+ for p in parts:
+ if p.get_rootfs() is None:
+ continue
+ if p.mountpoint == '/':
+ str = ':'
+ else:
+ str = '["%s"]:' % p.label
+ msg += ' ROOTFS_DIR%s%s\n' % (str.ljust(20), p.get_rootfs())
+
+ msg += ' BOOTIMG_DIR: %s\n' % self.bootimg_dir
+ msg += ' KERNEL_DIR: %s\n' % self.kernel_dir
+ msg += ' NATIVE_SYSROOT: %s\n' % self.native_sysroot
msger.info(msg)
OpenPOWER on IntegriCloud