]> code.ossystems Code Review - openembedded-core.git/commitdiff
wic: Rename /mic to /wic
authorTom Zanussi <tom.zanussi@linux.intel.com>
Fri, 8 Aug 2014 20:53:52 +0000 (15:53 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 11 Aug 2014 09:52:19 +0000 (10:52 +0100)
As well as any other stray instances of mic in the codebase that can
be removed.

We don't really need to carry around legacy naming, and the history is
in git.

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
47 files changed:
scripts/lib/image/engine.py
scripts/lib/image/help.py
scripts/lib/wic/3rdparty/pykickstart/__init__.py [moved from scripts/lib/mic/3rdparty/pykickstart/__init__.py with 100% similarity]
scripts/lib/wic/3rdparty/pykickstart/base.py [moved from scripts/lib/mic/3rdparty/pykickstart/base.py with 100% similarity]
scripts/lib/wic/3rdparty/pykickstart/commands/__init__.py [moved from scripts/lib/mic/3rdparty/pykickstart/commands/__init__.py with 100% similarity]
scripts/lib/wic/3rdparty/pykickstart/commands/bootloader.py [moved from scripts/lib/mic/3rdparty/pykickstart/commands/bootloader.py with 100% similarity]
scripts/lib/wic/3rdparty/pykickstart/commands/partition.py [moved from scripts/lib/mic/3rdparty/pykickstart/commands/partition.py with 100% similarity]
scripts/lib/wic/3rdparty/pykickstart/constants.py [moved from scripts/lib/mic/3rdparty/pykickstart/constants.py with 100% similarity]
scripts/lib/wic/3rdparty/pykickstart/errors.py [moved from scripts/lib/mic/3rdparty/pykickstart/errors.py with 100% similarity]
scripts/lib/wic/3rdparty/pykickstart/handlers/__init__.py [moved from scripts/lib/mic/3rdparty/pykickstart/handlers/__init__.py with 100% similarity]
scripts/lib/wic/3rdparty/pykickstart/handlers/control.py [moved from scripts/lib/mic/3rdparty/pykickstart/handlers/control.py with 100% similarity]
scripts/lib/wic/3rdparty/pykickstart/handlers/f16.py [moved from scripts/lib/mic/3rdparty/pykickstart/handlers/f16.py with 100% similarity]
scripts/lib/wic/3rdparty/pykickstart/ko.py [moved from scripts/lib/mic/3rdparty/pykickstart/ko.py with 100% similarity]
scripts/lib/wic/3rdparty/pykickstart/options.py [moved from scripts/lib/mic/3rdparty/pykickstart/options.py with 100% similarity]
scripts/lib/wic/3rdparty/pykickstart/parser.py [moved from scripts/lib/mic/3rdparty/pykickstart/parser.py with 100% similarity]
scripts/lib/wic/3rdparty/pykickstart/sections.py [moved from scripts/lib/mic/3rdparty/pykickstart/sections.py with 100% similarity]
scripts/lib/wic/3rdparty/pykickstart/version.py [moved from scripts/lib/mic/3rdparty/pykickstart/version.py with 100% similarity]
scripts/lib/wic/__init__.py [moved from scripts/lib/mic/__init__.py with 100% similarity]
scripts/lib/wic/__version__.py [moved from scripts/lib/mic/__version__.py with 100% similarity]
scripts/lib/wic/conf.py [moved from scripts/lib/mic/conf.py with 93% similarity]
scripts/lib/wic/creator.py [moved from scripts/lib/mic/creator.py with 96% similarity]
scripts/lib/wic/imager/__init__.py [moved from scripts/lib/mic/imager/__init__.py with 100% similarity]
scripts/lib/wic/imager/baseimager.py [moved from scripts/lib/mic/imager/baseimager.py with 96% similarity]
scripts/lib/wic/imager/direct.py [moved from scripts/lib/mic/imager/direct.py with 96% similarity]
scripts/lib/wic/kickstart/__init__.py [moved from scripts/lib/mic/kickstart/__init__.py with 98% similarity]
scripts/lib/wic/kickstart/custom_commands/__init__.py [moved from scripts/lib/mic/kickstart/custom_commands/__init__.py with 100% similarity]
scripts/lib/wic/kickstart/custom_commands/micboot.py [moved from scripts/lib/mic/kickstart/custom_commands/micboot.py with 100% similarity]
scripts/lib/wic/kickstart/custom_commands/micpartition.py [moved from scripts/lib/mic/kickstart/custom_commands/micpartition.py with 100% similarity]
scripts/lib/wic/kickstart/custom_commands/partition.py [moved from scripts/lib/mic/kickstart/custom_commands/partition.py with 99% similarity]
scripts/lib/wic/kickstart/custom_commands/wicboot.py [moved from scripts/lib/mic/kickstart/custom_commands/wicboot.py with 97% similarity]
scripts/lib/wic/msger.py [moved from scripts/lib/mic/msger.py with 100% similarity]
scripts/lib/wic/plugin.py [moved from scripts/lib/mic/plugin.py with 94% similarity]
scripts/lib/wic/pluginbase.py [moved from scripts/lib/mic/pluginbase.py with 88% similarity]
scripts/lib/wic/plugins/imager/direct_plugin.py [moved from scripts/lib/mic/plugins/imager/direct_plugin.py with 89% similarity]
scripts/lib/wic/plugins/source/bootimg-efi.py [moved from scripts/lib/mic/plugins/source/bootimg-efi.py with 94% similarity]
scripts/lib/wic/plugins/source/bootimg-pcbios.py [moved from scripts/lib/mic/plugins/source/bootimg-pcbios.py with 95% similarity]
scripts/lib/wic/plugins/source/rootfs.py [moved from scripts/lib/mic/plugins/source/rootfs.py with 90% similarity]
scripts/lib/wic/test [moved from scripts/lib/mic/test with 100% similarity]
scripts/lib/wic/utils/__init__.py [moved from scripts/lib/mic/utils/__init__.py with 100% similarity]
scripts/lib/wic/utils/cmdln.py [moved from scripts/lib/mic/utils/cmdln.py with 100% similarity]
scripts/lib/wic/utils/errors.py [moved from scripts/lib/mic/utils/errors.py with 100% similarity]
scripts/lib/wic/utils/fs_related.py [moved from scripts/lib/mic/utils/fs_related.py with 96% similarity]
scripts/lib/wic/utils/misc.py [moved from scripts/lib/mic/utils/misc.py with 100% similarity]
scripts/lib/wic/utils/oe/__init__.py [moved from scripts/lib/mic/utils/oe/__init__.py with 95% similarity]
scripts/lib/wic/utils/oe/misc.py [moved from scripts/lib/mic/utils/oe/misc.py with 97% similarity]
scripts/lib/wic/utils/partitionedfs.py [moved from scripts/lib/mic/utils/partitionedfs.py with 98% similarity]
scripts/lib/wic/utils/runner.py [moved from scripts/lib/mic/utils/runner.py with 99% similarity]

index b850bb9bfe6e2d109aeb18a9f1f09a9157350e16..f1df8b4db8f3b0071a04d26ba49bae51b8f6ad58 100644 (file)
@@ -37,12 +37,12 @@ import subprocess
 import shutil
 
 import os, sys, errno
-from mic import msger, creator
-from mic.utils import cmdln, misc, errors
-from mic.conf import configmgr
-from mic.plugin import pluginmgr
-from mic.__version__ import VERSION
-from mic.utils.oe.misc import *
+from wic import msger, creator
+from wic.utils import cmdln, misc, errors
+from wic.conf import configmgr
+from wic.plugin import pluginmgr
+from wic.__version__ import VERSION
+from wic.utils.oe.misc import *
 
 
 def verify_build_env():
index 6503aaa18d0df650190e5c518363ddccd7b897ee..080795e57788a7de8996dd2cd725958f31a2a525 100644 (file)
@@ -144,7 +144,7 @@ DESCRIPTION
     the corresponding artifacts are typically found in a normal
     OpenEmbedded build.
 
-    Alternatively, users can use the -e option to have 'mic' determine
+    Alternatively, users can use the -e option to have 'wic' determine
     those locations for a given image.  If the -e option is used, the
     user needs to have set the appropriate MACHINE variable in
     local.conf, and have sourced the build environment.
@@ -349,12 +349,12 @@ DESCRIPTION
     implementation that populates a corresponding partition.
 
     A source plugin is created as a subclass of SourcePlugin (see
-    scripts/lib/mic/pluginbase.py) and the plugin file containing it
-    is added to scripts/lib/mic/plugins/source/ to make the plugin
+    scripts/lib/wic/pluginbase.py) and the plugin file containing it
+    is added to scripts/lib/wic/plugins/source/ to make the plugin
     implementation available to the wic implementation.
 
     Source plugins can also be implemented and added by external
-    layers - any plugins found in a scripts/lib/mic/plugins/source/
+    layers - any plugins found in a scripts/lib/wic/plugins/source/
     directory in an external layer will also be made available.
 
     When the wic implementation needs to invoke a partition-specific
similarity index 93%
rename from scripts/lib/mic/conf.py
rename to scripts/lib/wic/conf.py
index a686e9caa7f49114a885c00e746bef46ff5c1265..d5419f8e943ff95a5dac43f127b1198c50446d53 100644 (file)
 import os, sys, re
 import ConfigParser
 
-from mic import msger
-from mic import kickstart
-from mic.utils import misc, runner, errors
+from wic import msger
+from wic import kickstart
+from wic.utils import misc, runner, errors
 
 
 def get_siteconf():
-    mic_path = os.path.dirname(__file__)
-    eos = mic_path.find('scripts') + len('scripts')
-    scripts_path = mic_path[:eos]
+    wic_path = os.path.dirname(__file__)
+    eos = wic_path.find('scripts') + len('scripts')
+    scripts_path = wic_path[:eos]
 
     return scripts_path + "/lib/image/config/wic.conf"
 
similarity index 96%
rename from scripts/lib/mic/creator.py
rename to scripts/lib/wic/creator.py
index 7c9ca6f9dce6b9e2dd141f4ae6faed8c56202a24..a4b19ac6e05dc4d05d8c18957bf99a2291168d31 100644 (file)
 import os, sys, re
 from optparse import SUPPRESS_HELP
 
-from mic import msger
-from mic.utils import cmdln, errors
-from mic.conf import configmgr
-from mic.plugin import pluginmgr
+from wic import msger
+from wic.utils import cmdln, errors
+from wic.conf import configmgr
+from wic.plugin import pluginmgr
 
 
 class Creator(cmdln.Cmdln):
@@ -34,7 +34,7 @@ class Creator(cmdln.Cmdln):
     ${option_list}
     """
 
-    name = 'mic create(cr)'
+    name = 'wic create(cr)'
 
     def __init__(self, *args, **kwargs):
         cmdln.Cmdln.__init__(self, *args, **kwargs)
@@ -64,7 +64,7 @@ class Creator(cmdln.Cmdln):
                              help='Path of logfile')
         optparser.add_option('-c', '--config', type='string', dest='config',
                              default=None,
-                             help='Specify config file for mic')
+                             help='Specify config file for wic')
         optparser.add_option('-o', '--outdir', type='string', action='store',
                              dest='outdir', default=None,
                              help='Output directory')
similarity index 96%
rename from scripts/lib/mic/imager/baseimager.py
rename to scripts/lib/wic/imager/baseimager.py
index 23919d4cfaf6c4cc71e4ef478de3872571a1792a..5bcd2f7529b57d80f33486983bddfec9a39e79f8 100644 (file)
@@ -21,10 +21,10 @@ import os, sys
 import tempfile
 import shutil
 
-from mic import kickstart
-from mic import msger
-from mic.utils.errors import CreatorError
-from mic.utils import misc, runner, fs_related as fs
+from wic import kickstart
+from wic import msger
+from wic.utils.errors import CreatorError
+from wic.utils import misc, runner, fs_related as fs
 
 class BaseImageCreator(object):
     """Base class for image creation.
@@ -34,7 +34,7 @@ class BaseImageCreator(object):
 
     e.g.
 
-      import mic.imgcreate as imgcreate
+      import wic.imgcreate as imgcreate
       ks = imgcreate.read_kickstart("foo.ks")
       imgcreate.ImageCreator(ks, "foo").create()
     """
similarity index 96%
rename from scripts/lib/mic/imager/direct.py
rename to scripts/lib/wic/imager/direct.py
index 2f2bd4e072f6fa1df523b482f7b023270ae44b4c..5b1285628906f9d2bb0b1f0cc805bb1b2fa49b31 100644 (file)
@@ -18,8 +18,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # DESCRIPTION
-# This implements the 'direct' image creator class for 'wic', based
-# loosely on the raw image creator from 'mic'
+# This implements the 'direct' image creator class for 'wic'
 #
 # AUTHORS
 # Tom Zanussi <tom.zanussi (at] linux.intel.com>
@@ -29,13 +28,13 @@ import os
 import stat
 import shutil
 
-from mic import kickstart, msger
-from mic.utils import fs_related, runner, misc
-from mic.utils.partitionedfs import Image
-from mic.utils.errors import CreatorError, ImageError
-from mic.imager.baseimager import BaseImageCreator
-from mic.utils.oe.misc import *
-from mic.plugin import pluginmgr
+from wic import kickstart, msger
+from wic.utils import fs_related, runner, misc
+from wic.utils.partitionedfs import Image
+from wic.utils.errors import CreatorError, ImageError
+from wic.imager.baseimager import BaseImageCreator
+from wic.utils.oe.misc import *
+from wic.plugin import pluginmgr
 
 disk_methods = {
     "do_install_disk":None,
similarity index 98%
rename from scripts/lib/mic/kickstart/__init__.py
rename to scripts/lib/wic/kickstart/__init__.py
index 590bf4728fc38f5a1816ceb64075b5b26562b75f..4f5b778b5d0898d0031d9f7aaebbe7303240ec37 100644 (file)
@@ -30,8 +30,8 @@ import pykickstart.version as ksversion
 from pykickstart.handlers.control import commandMap
 from pykickstart.handlers.control import dataMap
 
-from mic import msger
-from mic.utils import errors, misc, runner, fs_related as fs
+from wic import msger
+from wic.utils import errors, misc, runner, fs_related as fs
 from custom_commands import wicboot, partition
 
 def read_kickstart(path):
similarity index 99%
rename from scripts/lib/mic/kickstart/custom_commands/partition.py
rename to scripts/lib/wic/kickstart/custom_commands/partition.py
index 101b90ef1086f012082461657d0c8b8cc3aee81c..24f523ae41f98480db64956ef85ed31d8c50561a 100644 (file)
@@ -29,9 +29,9 @@ import os
 import tempfile
 
 from pykickstart.commands.partition import *
-from mic.utils.oe.misc import *
-from mic.kickstart.custom_commands import *
-from mic.plugin import pluginmgr
+from wic.utils.oe.misc import *
+from wic.kickstart.custom_commands import *
+from wic.plugin import pluginmgr
 
 partition_methods = {
     "do_stage_partition":None,
similarity index 97%
rename from scripts/lib/mic/kickstart/custom_commands/wicboot.py
rename to scripts/lib/wic/kickstart/custom_commands/wicboot.py
index ab8871de4e73bef5437c1387aec766d1f71d013e..f1914169d860d148db585ca04bdb7b60df37454a 100644 (file)
@@ -29,7 +29,7 @@ from pykickstart.errors import *
 from pykickstart.options import *
 from pykickstart.commands.bootloader import *
 
-from mic.kickstart.custom_commands.micboot import *
+from wic.kickstart.custom_commands.micboot import *
 
 class Wic_Bootloader(Mic_Bootloader):
     def __init__(self, writePriority=10, appendLine="", driveorder=None,
similarity index 94%
rename from scripts/lib/mic/plugin.py
rename to scripts/lib/wic/plugin.py
index 43afdbc2f2e5c823c292193bed9cac2191e37be5..61c5859bac085f393b7643e02fabe8c0c5f69692 100644 (file)
 
 import os, sys
 
-from mic import msger
-from mic import pluginbase
-from mic.utils import errors
-from mic.utils.oe.misc import *
+from wic import msger
+from wic import pluginbase
+from wic.utils import errors
+from wic.utils.oe.misc import *
 
 __ALL__ = ['PluginMgr', 'pluginmgr']
 
 PLUGIN_TYPES = ["imager", "source"]
 
-PLUGIN_DIR = "/lib/mic/plugins" # relative to scripts
+PLUGIN_DIR = "/lib/wic/plugins" # relative to scripts
 SCRIPTS_PLUGIN_DIR = "scripts" + PLUGIN_DIR
 
 class PluginMgr(object):
@@ -41,9 +41,9 @@ class PluginMgr(object):
         return cls._instance
 
     def __init__(self):
-        mic_path = os.path.dirname(__file__)
-        eos = mic_path.find('scripts') + len('scripts')
-        scripts_path = mic_path[:eos]
+        wic_path = os.path.dirname(__file__)
+        eos = wic_path.find('scripts') + len('scripts')
+        scripts_path = wic_path[:eos]
         self.scripts_path = scripts_path
         self.plugin_dir = scripts_path + PLUGIN_DIR
         self.layers_path = None
similarity index 88%
rename from scripts/lib/mic/pluginbase.py
rename to scripts/lib/wic/pluginbase.py
index 46a4f4a6b6f977d185117fb7b8b09fa2a9d39226..06f318f624cbf11b8ffbd0cf5d46e91da711c4c0 100644 (file)
@@ -17,8 +17,8 @@
 
 import os
 import shutil
-from mic import msger
-from mic.utils import errors
+from wic import msger
+from wic.utils import errors
 
 class _Plugin(object):
     class __metaclass__(type):
@@ -26,15 +26,15 @@ class _Plugin(object):
             if not hasattr(cls, 'plugins'):
                 cls.plugins = {}
 
-            elif 'mic_plugin_type' in attrs:
-                if attrs['mic_plugin_type'] not in cls.plugins:
-                    cls.plugins[attrs['mic_plugin_type']] = {}
+            elif 'wic_plugin_type' in attrs:
+                if attrs['wic_plugin_type'] not in cls.plugins:
+                    cls.plugins[attrs['wic_plugin_type']] = {}
 
-            elif hasattr(cls, 'mic_plugin_type') and 'name' in attrs:
-                cls.plugins[cls.mic_plugin_type][attrs['name']] = cls
+            elif hasattr(cls, 'wic_plugin_type') and 'name' in attrs:
+                cls.plugins[cls.wic_plugin_type][attrs['name']] = cls
 
         def show_plugins(cls):
-            for cls in cls.plugins[cls.mic_plugin_type]:
+            for cls in cls.plugins[cls.wic_plugin_type]:
                 print cls
 
         def get_plugins(cls):
@@ -42,11 +42,11 @@ class _Plugin(object):
 
 
 class ImagerPlugin(_Plugin):
-    mic_plugin_type = "imager"
+    wic_plugin_type = "imager"
 
 
 class SourcePlugin(_Plugin):
-    mic_plugin_type = "source"
+    wic_plugin_type = "source"
     """
     The methods that can be implemented by --source plugins.
 
similarity index 89%
rename from scripts/lib/mic/plugins/imager/direct_plugin.py
rename to scripts/lib/wic/plugins/imager/direct_plugin.py
index c05a40076898c3b27ba8181a9604f4c80c6de371..dabd6fc3e02d08af5f8542bd67467729caf97492 100644 (file)
@@ -18,8 +18,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # DESCRIPTION
-# This implements the 'direct' imager plugin class for 'wic', based
-# loosely on the raw imager plugin from 'mic'
+# This implements the 'direct' imager plugin class for 'wic'
 #
 # AUTHORS
 # Tom Zanussi <tom.zanussi (at] linux.intel.com>
@@ -30,13 +29,13 @@ import shutil
 import re
 import tempfile
 
-from mic import msger
-from mic.utils import misc, fs_related, errors, runner, cmdln
-from mic.conf import configmgr
-from mic.plugin import pluginmgr
+from wic import msger
+from wic.utils import misc, fs_related, errors, runner, cmdln
+from wic.conf import configmgr
+from wic.plugin import pluginmgr
 
-import mic.imager.direct as direct
-from mic.pluginbase import ImagerPlugin
+import wic.imager.direct as direct
+from wic.pluginbase import ImagerPlugin
 
 class DirectPlugin(ImagerPlugin):
     name = 'direct'
similarity index 94%
rename from scripts/lib/mic/plugins/source/bootimg-efi.py
rename to scripts/lib/wic/plugins/source/bootimg-efi.py
index 5b1a5332c4ed453350ceba121527b530855b6e69..53f1782381c1f07b51af3aed99962ba689bcd726 100644 (file)
@@ -29,14 +29,14 @@ import shutil
 import re
 import tempfile
 
-from mic import kickstart, msger
-from mic.utils import misc, fs_related, errors, runner, cmdln
-from mic.conf import configmgr
-from mic.plugin import pluginmgr
-import mic.imager.direct as direct
-from mic.pluginbase import SourcePlugin
-from mic.utils.oe.misc import *
-from mic.imager.direct import DirectImageCreator
+from wic import kickstart, msger
+from wic.utils import misc, fs_related, errors, runner, cmdln
+from wic.conf import configmgr
+from wic.plugin import pluginmgr
+import wic.imager.direct as direct
+from wic.pluginbase import SourcePlugin
+from wic.utils.oe.misc import *
+from wic.imager.direct import DirectImageCreator
 
 class BootimgEFIPlugin(SourcePlugin):
     name = 'bootimg-efi'
similarity index 95%
rename from scripts/lib/mic/plugins/source/bootimg-pcbios.py
rename to scripts/lib/wic/plugins/source/bootimg-pcbios.py
index 959cf411bfc9a28976e83a8c501ac8cbac48ad3a..bd2225eeaf9beb3b1241fce7f19e3f831928b021 100644 (file)
@@ -29,14 +29,14 @@ import shutil
 import re
 import tempfile
 
-from mic import kickstart, msger
-from mic.utils import misc, fs_related, errors, runner, cmdln
-from mic.conf import configmgr
-from mic.plugin import pluginmgr
-import mic.imager.direct as direct
-from mic.pluginbase import SourcePlugin
-from mic.utils.oe.misc import *
-from mic.imager.direct import DirectImageCreator
+from wic import kickstart, msger
+from wic.utils import misc, fs_related, errors, runner, cmdln
+from wic.conf import configmgr
+from wic.plugin import pluginmgr
+import wic.imager.direct as direct
+from wic.pluginbase import SourcePlugin
+from wic.utils.oe.misc import *
+from wic.imager.direct import DirectImageCreator
 
 class BootimgPcbiosPlugin(SourcePlugin):
     name = 'bootimg-pcbios'
similarity index 90%
rename from scripts/lib/mic/plugins/source/rootfs.py
rename to scripts/lib/wic/plugins/source/rootfs.py
index 8ebf62c10b37b0d811886bfafcb890303aeb7ccc..919e97e6b69f467f42868b9e1a6e4705594fb196 100644 (file)
@@ -30,14 +30,14 @@ import shutil
 import re
 import tempfile
 
-from mic import kickstart, msger
-from mic.utils import misc, fs_related, errors, runner, cmdln
-from mic.conf import configmgr
-from mic.plugin import pluginmgr
-import mic.imager.direct as direct
-from mic.pluginbase import SourcePlugin
-from mic.utils.oe.misc import *
-from mic.imager.direct import DirectImageCreator
+from wic import kickstart, msger
+from wic.utils import misc, fs_related, errors, runner, cmdln
+from wic.conf import configmgr
+from wic.plugin import pluginmgr
+import wic.imager.direct as direct
+from wic.pluginbase import SourcePlugin
+from wic.utils.oe.misc import *
+from wic.imager.direct import DirectImageCreator
 
 class RootfsPlugin(SourcePlugin):
     name = 'rootfs'
similarity index 100%
rename from scripts/lib/mic/test
rename to scripts/lib/wic/test
similarity index 96%
rename from scripts/lib/mic/utils/fs_related.py
rename to scripts/lib/wic/utils/fs_related.py
index cf2a759a0662803ec42f76730d79f33f29e01063..79cc1d52a7156b4883b2eebce85db21f5a7a5015 100644 (file)
@@ -26,10 +26,10 @@ import string
 import time
 import uuid
 
-from mic import msger
-from mic.utils import runner
-from mic.utils.errors import *
-from mic.utils.oe.misc import *
+from wic import msger
+from wic.utils import runner
+from wic.utils.errors import *
+from wic.utils.oe.misc import *
 
 def find_binary_path(binary):
     if os.environ.has_key("PATH"):
similarity index 95%
rename from scripts/lib/mic/utils/oe/__init__.py
rename to scripts/lib/wic/utils/oe/__init__.py
index d10e802116644e30688b7ea79e570bf25740561b..0a81575a7444dc9a768680bea2405609d5f2d9f2 100644 (file)
@@ -1,5 +1,5 @@
 #
-# OpenEmbedded mic utils library
+# OpenEmbedded wic utils library
 #
 # Copyright (c) 2013, Intel Corporation.
 # All rights reserved.
similarity index 97%
rename from scripts/lib/mic/utils/oe/misc.py
rename to scripts/lib/wic/utils/oe/misc.py
index bed275090d0fbf560fe67d123568e6c028d34ab9..87e30411b075c18af5082c27c6ddd2163d4f1965 100644 (file)
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # DESCRIPTION
-# This module provides a place to collect various mic-related utils
+# This module provides a place to collect various wic-related utils
 # for the OpenEmbedded Image Tools.
 #
 # AUTHORS
 # Tom Zanussi <tom.zanussi (at] linux.intel.com>
 #
 
-from mic import msger
-from mic.utils import runner
+from wic import msger
+from wic.utils import runner
 
 def __exec_cmd(cmd_and_args, as_shell = False, catch = 3):
     """
similarity index 98%
rename from scripts/lib/mic/utils/partitionedfs.py
rename to scripts/lib/wic/utils/partitionedfs.py
index 68e4cabbe0bb3c0b55c19eae6df862374e972954..76aa42135bdbbac6d126356c376fe1dd52ebc13e 100644 (file)
 
 import os
 
-from mic import msger
-from mic.utils import runner
-from mic.utils.errors import ImageError
-from mic.utils.fs_related import *
-from mic.utils.oe.misc import *
+from wic import msger
+from wic.utils import runner
+from wic.utils.errors import ImageError
+from wic.utils.fs_related import *
+from wic.utils.oe.misc import *
 
 # Overhead of the MBR partitioning scheme (just one sector)
 MBR_OVERHEAD = 1
similarity index 99%
rename from scripts/lib/mic/utils/runner.py
rename to scripts/lib/wic/utils/runner.py
index fded3c93fa17c5723d5b47a13ee1072a5306063d..e740dad25398a74860a9fa8974348d6796c0ea6d 100644 (file)
@@ -18,7 +18,7 @@
 import os
 import subprocess
 
-from mic import msger
+from wic import msger
 
 def runtool(cmdln_or_args, catch=1):
     """ wrapper for most of the subprocess calls