aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJoão Henrique Ferreira de Freitas <joaohf@gmail.com>2014-03-29 00:12:03 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-30 10:01:58 +0100
commit26cd93b79318cbfaebb971d1e728041904e015f1 (patch)
tree4466ccaad314b1a77fe2f9330d53ce4891cb5516 /scripts
parent68dd66849bbaca6e3a0cf00beec0dba1c08e9070 (diff)
downloadopenembedded-core-26cd93b79318cbfaebb971d1e728041904e015f1.tar.gz
openembedded-core-26cd93b79318cbfaebb971d1e728041904e015f1.tar.bz2
openembedded-core-26cd93b79318cbfaebb971d1e728041904e015f1.zip
wic: Hook up RootfsPlugin plugin
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 <joaohf@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/mic/kickstart/custom_commands/partition.py28
1 files changed, 12 insertions, 16 deletions
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):