From 26cd93b79318cbfaebb971d1e728041904e015f1 Mon Sep 17 00:00:00 2001 From: João Henrique Ferreira de Freitas Date: Sat, 29 Mar 2014 00:12:03 -0300 Subject: wic: Hook up RootfsPlugin plugin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove the 'rootfs' case when internal call code is used and replace to call the general-purpose plugin. For now RootfsPluing class continues to invoke prepare_rootfs() method from Wic_PartData. However RootfsPlugin could implement them. Signed-off-by: João Henrique Ferreira de Freitas Signed-off-by: Richard Purdie --- .../lib/mic/kickstart/custom_commands/partition.py | 28 ++++++++++------------ 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'scripts') diff --git a/scripts/lib/mic/kickstart/custom_commands/partition.py b/scripts/lib/mic/kickstart/custom_commands/partition.py index e15150b657..c3bb9a5b86 100644 --- a/scripts/lib/mic/kickstart/custom_commands/partition.py +++ b/scripts/lib/mic/kickstart/custom_commands/partition.py @@ -114,24 +114,20 @@ class Wic_PartData(Mic_PartData): native_sysroot) return - if self.source.startswith("rootfs"): - self.prepare_rootfs(cr_workdir, oe_builddir, rootfs_dir, - native_sysroot) - else: - self._source_methods = pluginmgr.get_source_plugin_methods(self.source, partition_methods) - self._source_methods["do_configure_partition"](self, cr, cr_workdir, - oe_builddir, - bootimg_dir, - kernel_dir, - native_sysroot) - self._source_methods["do_stage_partition"](self, cr, cr_workdir, + self._source_methods = pluginmgr.get_source_plugin_methods(self.source, partition_methods) + self._source_methods["do_configure_partition"](self, cr, cr_workdir, oe_builddir, - bootimg_dir, kernel_dir, + bootimg_dir, + kernel_dir, native_sysroot) - self._source_methods["do_prepare_partition"](self, cr, cr_workdir, - oe_builddir, - bootimg_dir, kernel_dir, - native_sysroot) + self._source_methods["do_stage_partition"](self, cr, cr_workdir, + oe_builddir, + bootimg_dir, kernel_dir, + native_sysroot) + self._source_methods["do_prepare_partition"](self, cr, cr_workdir, + oe_builddir, + bootimg_dir, kernel_dir, rootfs_dir, + native_sysroot) def prepare_rootfs_from_fs_image(self, cr_workdir, oe_builddir, rootfs_dir): -- cgit 1.2.3-korg