aboutsummaryrefslogtreecommitdiffstats
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:01:58 +0100
commita8762f3be215678a6806cabe49647083f42323a8 (patch)
tree914f00373b3aace1471ba442b99016f83c06a029
parentd486db593e6643bd10b8fe90257d547a9f341043 (diff)
downloadopenembedded-core-contrib-a8762f3be215678a6806cabe49647083f42323a8.tar.gz
openembedded-core-contrib-a8762f3be215678a6806cabe49647083f42323a8.tar.bz2
openembedded-core-contrib-a8762f3be215678a6806cabe49647083f42323a8.zip
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. Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/mic/imager/direct.py18
-rw-r--r--scripts/lib/mic/kickstart/custom_commands/partition.py13
-rw-r--r--scripts/lib/mic/plugins/source/rootfs.py1
3 files changed, 28 insertions, 4 deletions
diff --git a/scripts/lib/mic/imager/direct.py b/scripts/lib/mic/imager/direct.py
index 1f2f8fcf9c..ac63c38903 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)
diff --git a/scripts/lib/mic/kickstart/custom_commands/partition.py b/scripts/lib/mic/kickstart/custom_commands/partition.py
index 887195fa60..6b575c0e8d 100644
--- a/scripts/lib/mic/kickstart/custom_commands/partition.py
+++ b/scripts/lib/mic/kickstart/custom_commands/partition.py
@@ -59,6 +59,19 @@ class Wic_PartData(Mic_PartData):
return retval
+ def get_rootfs(self):
+ """
+ Acessor for rootfs dir
+ """
+ return self.rootfs
+
+ def set_rootfs(self, rootfs):
+ """
+ Acessor for actual rootfs dir, which must be set by source
+ plugins.
+ """
+ self.rootfs = rootfs
+
def get_size(self):
"""
Accessor for partition size, 0 or --size before set_size().
diff --git a/scripts/lib/mic/plugins/source/rootfs.py b/scripts/lib/mic/plugins/source/rootfs.py
index 974d85409b..6323811183 100644
--- a/scripts/lib/mic/plugins/source/rootfs.py
+++ b/scripts/lib/mic/plugins/source/rootfs.py
@@ -54,5 +54,6 @@ class RootfsPlugin(SourcePlugin):
if part.rootfs:
rootfs_dir = part.rootfs
+ part.set_rootfs(rootfs_dir)
part.prepare_rootfs(cr_workdir, oe_builddir, rootfs_dir, native_sysroot)