[oe-commits] Tom Zanussi : wic: Update/rename configure-related code

git at git.openembedded.org git at git.openembedded.org
Mon Aug 11 09:55:18 UTC 2014


Module: openembedded-core.git
Branch: master
Commit: 58dc8879bba31542e2386aaaa70034621b2b1e4e
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=58dc8879bba31542e2386aaaa70034621b2b1e4e

Author: Tom Zanussi <tom.zanussi at linux.intel.com>
Date:   Fri Aug  8 13:43:45 2014 -0500

wic: Update/rename configure-related code

The wic code inherited a basic image-creation flow based on
image-configuration, but wic doesn't actually configure anything, so
rename parts of the code dealing with configuration to something more
appropriate.

Signed-off-by: Tom Zanussi <tom.zanussi at linux.intel.com>

---

 scripts/lib/mic/imager/direct.py                | 7 ++++---
 scripts/lib/mic/plugins/imager/direct_plugin.py | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/lib/mic/imager/direct.py b/scripts/lib/mic/imager/direct.py
index 8d7b6ee..17bfd01 100644
--- a/scripts/lib/mic/imager/direct.py
+++ b/scripts/lib/mic/imager/direct.py
@@ -284,12 +284,13 @@ class DirectImageCreator(BaseImageCreator):
                         % (disk_name, full_path, disk['min_size']))
             self.__image.assemble(full_path)
 
-    def configure(self):
+    def finalize(self):
         """
-        Configure the system image according to kickstart.
+        Finalize the disk image.
 
-        For now, it just prepares the image to be bootable by e.g.
+        For example, prepare the image to be bootable by e.g.
         creating and installing a bootloader configuration.
+
         """
         source_plugin = self.get_default_source_plugin()
         if source_plugin:
diff --git a/scripts/lib/mic/plugins/imager/direct_plugin.py b/scripts/lib/mic/plugins/imager/direct_plugin.py
index 2cbd5d1..ff30f09 100644
--- a/scripts/lib/mic/plugins/imager/direct_plugin.py
+++ b/scripts/lib/mic/plugins/imager/direct_plugin.py
@@ -93,7 +93,7 @@ class DirectPlugin(ImagerPlugin):
         try:
             creator.create()
             creator.assemble()
-            creator.configure()
+            creator.finalize()
             creator.print_outimage_info()
 
         except errors.CreatorError:



More information about the Openembedded-commits mailing list