mirror of
https://git.yoctoproject.org/poky
synced 2026-05-02 00:32:12 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
13afd35868
commit
3c00384884
@@ -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)
|
||||
|
||||
|
||||
@@ -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().
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user