summaryrefslogtreecommitdiffstats
path: root/scripts/lib/mic
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:10:34 +0100
commit25d16c493412bdec11fd169edc92ce6df9338020 (patch)
tree96335d60d28653ca71ae32fbd57c17a06210c52d /scripts/lib/mic
parent66bb67d0ffa8fe5b123a2c3aa9889be9d10e7b0b (diff)
downloadpoky-25d16c493412bdec11fd169edc92ce6df9338020.tar.gz
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. (From OE-Core rev: 26cd93b79318cbfaebb971d1e728041904e015f1) 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')
-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):
114 native_sysroot) 114 native_sysroot)
115 return 115 return
116 116
117 if self.source.startswith("rootfs"): 117 self._source_methods = pluginmgr.get_source_plugin_methods(self.source, partition_methods)
118 self.prepare_rootfs(cr_workdir, oe_builddir, rootfs_dir, 118 self._source_methods["do_configure_partition"](self, cr, cr_workdir,
119 native_sysroot)
120 else:
121 self._source_methods = pluginmgr.get_source_plugin_methods(self.source, partition_methods)
122 self._source_methods["do_configure_partition"](self, cr, cr_workdir,
123 oe_builddir,
124 bootimg_dir,
125 kernel_dir,
126 native_sysroot)
127 self._source_methods["do_stage_partition"](self, cr, cr_workdir,
128 oe_builddir, 119 oe_builddir,
129 bootimg_dir, kernel_dir, 120 bootimg_dir,
121 kernel_dir,
130 native_sysroot) 122 native_sysroot)
131 self._source_methods["do_prepare_partition"](self, cr, cr_workdir, 123 self._source_methods["do_stage_partition"](self, cr, cr_workdir,
132 oe_builddir, 124 oe_builddir,
133 bootimg_dir, kernel_dir, 125 bootimg_dir, kernel_dir,
134 native_sysroot) 126 native_sysroot)
127 self._source_methods["do_prepare_partition"](self, cr, cr_workdir,
128 oe_builddir,
129 bootimg_dir, kernel_dir, rootfs_dir,
130 native_sysroot)
135 131
136 def prepare_rootfs_from_fs_image(self, cr_workdir, oe_builddir, 132 def prepare_rootfs_from_fs_image(self, cr_workdir, oe_builddir,
137 rootfs_dir): 133 rootfs_dir):