summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2014-08-08 15:53:52 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-11 10:53:12 +0100
commitd8f9d05baee3abd4feb0a5b2f2afe467e919c6b9 (patch)
treeedc6ba90a220ad5bbba41998c3c5c82e1e97760d
parenta43c1f94205d95c6eb77af2f0a494b4143f9eaf8 (diff)
downloadpoky-d8f9d05baee3abd4feb0a5b2f2afe467e919c6b9.tar.gz
wic: Rename /mic to /wic
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. (From OE-Core rev: 598b120406dc1d2b7e377bd1ab6f0acbef034b22) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/image/engine.py12
-rw-r--r--scripts/lib/image/help.py8
-rw-r--r--scripts/lib/wic/3rdparty/pykickstart/__init__.py (renamed from scripts/lib/mic/3rdparty/pykickstart/__init__.py)0
-rw-r--r--scripts/lib/wic/3rdparty/pykickstart/base.py (renamed from scripts/lib/mic/3rdparty/pykickstart/base.py)0
-rw-r--r--scripts/lib/wic/3rdparty/pykickstart/commands/__init__.py (renamed from scripts/lib/mic/3rdparty/pykickstart/commands/__init__.py)0
-rw-r--r--scripts/lib/wic/3rdparty/pykickstart/commands/bootloader.py (renamed from scripts/lib/mic/3rdparty/pykickstart/commands/bootloader.py)0
-rw-r--r--scripts/lib/wic/3rdparty/pykickstart/commands/partition.py (renamed from scripts/lib/mic/3rdparty/pykickstart/commands/partition.py)0
-rw-r--r--scripts/lib/wic/3rdparty/pykickstart/constants.py (renamed from scripts/lib/mic/3rdparty/pykickstart/constants.py)0
-rw-r--r--scripts/lib/wic/3rdparty/pykickstart/errors.py (renamed from scripts/lib/mic/3rdparty/pykickstart/errors.py)0
-rw-r--r--scripts/lib/wic/3rdparty/pykickstart/handlers/__init__.py (renamed from scripts/lib/mic/3rdparty/pykickstart/handlers/__init__.py)0
-rw-r--r--scripts/lib/wic/3rdparty/pykickstart/handlers/control.py (renamed from scripts/lib/mic/3rdparty/pykickstart/handlers/control.py)0
-rw-r--r--scripts/lib/wic/3rdparty/pykickstart/handlers/f16.py (renamed from scripts/lib/mic/3rdparty/pykickstart/handlers/f16.py)0
-rw-r--r--scripts/lib/wic/3rdparty/pykickstart/ko.py (renamed from scripts/lib/mic/3rdparty/pykickstart/ko.py)0
-rw-r--r--scripts/lib/wic/3rdparty/pykickstart/options.py (renamed from scripts/lib/mic/3rdparty/pykickstart/options.py)0
-rw-r--r--scripts/lib/wic/3rdparty/pykickstart/parser.py (renamed from scripts/lib/mic/3rdparty/pykickstart/parser.py)0
-rw-r--r--scripts/lib/wic/3rdparty/pykickstart/sections.py (renamed from scripts/lib/mic/3rdparty/pykickstart/sections.py)0
-rw-r--r--scripts/lib/wic/3rdparty/pykickstart/version.py (renamed from scripts/lib/mic/3rdparty/pykickstart/version.py)0
-rw-r--r--scripts/lib/wic/__init__.py (renamed from scripts/lib/mic/__init__.py)0
-rw-r--r--scripts/lib/wic/__version__.py (renamed from scripts/lib/mic/__version__.py)0
-rw-r--r--scripts/lib/wic/conf.py (renamed from scripts/lib/mic/conf.py)12
-rw-r--r--scripts/lib/wic/creator.py (renamed from scripts/lib/mic/creator.py)12
-rw-r--r--scripts/lib/wic/imager/__init__.py (renamed from scripts/lib/mic/imager/__init__.py)0
-rw-r--r--scripts/lib/wic/imager/baseimager.py (renamed from scripts/lib/mic/imager/baseimager.py)10
-rw-r--r--scripts/lib/wic/imager/direct.py (renamed from scripts/lib/mic/imager/direct.py)17
-rw-r--r--scripts/lib/wic/kickstart/__init__.py (renamed from scripts/lib/mic/kickstart/__init__.py)4
-rw-r--r--scripts/lib/wic/kickstart/custom_commands/__init__.py (renamed from scripts/lib/mic/kickstart/custom_commands/__init__.py)0
-rw-r--r--scripts/lib/wic/kickstart/custom_commands/micboot.py (renamed from scripts/lib/mic/kickstart/custom_commands/micboot.py)0
-rw-r--r--scripts/lib/wic/kickstart/custom_commands/micpartition.py (renamed from scripts/lib/mic/kickstart/custom_commands/micpartition.py)0
-rw-r--r--scripts/lib/wic/kickstart/custom_commands/partition.py (renamed from scripts/lib/mic/kickstart/custom_commands/partition.py)6
-rw-r--r--scripts/lib/wic/kickstart/custom_commands/wicboot.py (renamed from scripts/lib/mic/kickstart/custom_commands/wicboot.py)2
-rw-r--r--scripts/lib/wic/msger.py (renamed from scripts/lib/mic/msger.py)0
-rw-r--r--scripts/lib/wic/plugin.py (renamed from scripts/lib/mic/plugin.py)16
-rw-r--r--scripts/lib/wic/pluginbase.py (renamed from scripts/lib/mic/pluginbase.py)20
-rw-r--r--scripts/lib/wic/plugins/imager/direct_plugin.py (renamed from scripts/lib/mic/plugins/imager/direct_plugin.py)15
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-efi.py (renamed from scripts/lib/mic/plugins/source/bootimg-efi.py)16
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-pcbios.py (renamed from scripts/lib/mic/plugins/source/bootimg-pcbios.py)16
-rw-r--r--scripts/lib/wic/plugins/source/rootfs.py (renamed from scripts/lib/mic/plugins/source/rootfs.py)16
-rw-r--r--scripts/lib/wic/test (renamed from scripts/lib/mic/test)0
-rw-r--r--scripts/lib/wic/utils/__init__.py (renamed from scripts/lib/mic/utils/__init__.py)0
-rw-r--r--scripts/lib/wic/utils/cmdln.py (renamed from scripts/lib/mic/utils/cmdln.py)0
-rw-r--r--scripts/lib/wic/utils/errors.py (renamed from scripts/lib/mic/utils/errors.py)0
-rw-r--r--scripts/lib/wic/utils/fs_related.py (renamed from scripts/lib/mic/utils/fs_related.py)8
-rw-r--r--scripts/lib/wic/utils/misc.py (renamed from scripts/lib/mic/utils/misc.py)0
-rw-r--r--scripts/lib/wic/utils/oe/__init__.py (renamed from scripts/lib/mic/utils/oe/__init__.py)2
-rw-r--r--scripts/lib/wic/utils/oe/misc.py (renamed from scripts/lib/mic/utils/oe/misc.py)6
-rw-r--r--scripts/lib/wic/utils/partitionedfs.py (renamed from scripts/lib/mic/utils/partitionedfs.py)10
-rw-r--r--scripts/lib/wic/utils/runner.py (renamed from scripts/lib/mic/utils/runner.py)2
47 files changed, 104 insertions, 106 deletions
diff --git a/scripts/lib/image/engine.py b/scripts/lib/image/engine.py
index b850bb9bfe..f1df8b4db8 100644
--- a/scripts/lib/image/engine.py
+++ b/scripts/lib/image/engine.py
@@ -37,12 +37,12 @@ import subprocess
37import shutil 37import shutil
38 38
39import os, sys, errno 39import os, sys, errno
40from mic import msger, creator 40from wic import msger, creator
41from mic.utils import cmdln, misc, errors 41from wic.utils import cmdln, misc, errors
42from mic.conf import configmgr 42from wic.conf import configmgr
43from mic.plugin import pluginmgr 43from wic.plugin import pluginmgr
44from mic.__version__ import VERSION 44from wic.__version__ import VERSION
45from mic.utils.oe.misc import * 45from wic.utils.oe.misc import *
46 46
47 47
48def verify_build_env(): 48def verify_build_env():
diff --git a/scripts/lib/image/help.py b/scripts/lib/image/help.py
index 6503aaa18d..080795e577 100644
--- a/scripts/lib/image/help.py
+++ b/scripts/lib/image/help.py
@@ -144,7 +144,7 @@ DESCRIPTION
144 the corresponding artifacts are typically found in a normal 144 the corresponding artifacts are typically found in a normal
145 OpenEmbedded build. 145 OpenEmbedded build.
146 146
147 Alternatively, users can use the -e option to have 'mic' determine 147 Alternatively, users can use the -e option to have 'wic' determine
148 those locations for a given image. If the -e option is used, the 148 those locations for a given image. If the -e option is used, the
149 user needs to have set the appropriate MACHINE variable in 149 user needs to have set the appropriate MACHINE variable in
150 local.conf, and have sourced the build environment. 150 local.conf, and have sourced the build environment.
@@ -349,12 +349,12 @@ DESCRIPTION
349 implementation that populates a corresponding partition. 349 implementation that populates a corresponding partition.
350 350
351 A source plugin is created as a subclass of SourcePlugin (see 351 A source plugin is created as a subclass of SourcePlugin (see
352 scripts/lib/mic/pluginbase.py) and the plugin file containing it 352 scripts/lib/wic/pluginbase.py) and the plugin file containing it
353 is added to scripts/lib/mic/plugins/source/ to make the plugin 353 is added to scripts/lib/wic/plugins/source/ to make the plugin
354 implementation available to the wic implementation. 354 implementation available to the wic implementation.
355 355
356 Source plugins can also be implemented and added by external 356 Source plugins can also be implemented and added by external
357 layers - any plugins found in a scripts/lib/mic/plugins/source/ 357 layers - any plugins found in a scripts/lib/wic/plugins/source/
358 directory in an external layer will also be made available. 358 directory in an external layer will also be made available.
359 359
360 When the wic implementation needs to invoke a partition-specific 360 When the wic implementation needs to invoke a partition-specific
diff --git a/scripts/lib/mic/3rdparty/pykickstart/__init__.py b/scripts/lib/wic/3rdparty/pykickstart/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/scripts/lib/mic/3rdparty/pykickstart/__init__.py
+++ b/scripts/lib/wic/3rdparty/pykickstart/__init__.py
diff --git a/scripts/lib/mic/3rdparty/pykickstart/base.py b/scripts/lib/wic/3rdparty/pykickstart/base.py
index e6c8f56f9d..e6c8f56f9d 100644
--- a/scripts/lib/mic/3rdparty/pykickstart/base.py
+++ b/scripts/lib/wic/3rdparty/pykickstart/base.py
diff --git a/scripts/lib/mic/3rdparty/pykickstart/commands/__init__.py b/scripts/lib/wic/3rdparty/pykickstart/commands/__init__.py
index 2d94550935..2d94550935 100644
--- a/scripts/lib/mic/3rdparty/pykickstart/commands/__init__.py
+++ b/scripts/lib/wic/3rdparty/pykickstart/commands/__init__.py
diff --git a/scripts/lib/mic/3rdparty/pykickstart/commands/bootloader.py b/scripts/lib/wic/3rdparty/pykickstart/commands/bootloader.py
index c2b552f689..c2b552f689 100644
--- a/scripts/lib/mic/3rdparty/pykickstart/commands/bootloader.py
+++ b/scripts/lib/wic/3rdparty/pykickstart/commands/bootloader.py
diff --git a/scripts/lib/mic/3rdparty/pykickstart/commands/partition.py b/scripts/lib/wic/3rdparty/pykickstart/commands/partition.py
index 56b91aa9d9..56b91aa9d9 100644
--- a/scripts/lib/mic/3rdparty/pykickstart/commands/partition.py
+++ b/scripts/lib/wic/3rdparty/pykickstart/commands/partition.py
diff --git a/scripts/lib/mic/3rdparty/pykickstart/constants.py b/scripts/lib/wic/3rdparty/pykickstart/constants.py
index 5e12fc80ec..5e12fc80ec 100644
--- a/scripts/lib/mic/3rdparty/pykickstart/constants.py
+++ b/scripts/lib/wic/3rdparty/pykickstart/constants.py
diff --git a/scripts/lib/mic/3rdparty/pykickstart/errors.py b/scripts/lib/wic/3rdparty/pykickstart/errors.py
index a234d99d43..a234d99d43 100644
--- a/scripts/lib/mic/3rdparty/pykickstart/errors.py
+++ b/scripts/lib/wic/3rdparty/pykickstart/errors.py
diff --git a/scripts/lib/mic/3rdparty/pykickstart/handlers/__init__.py b/scripts/lib/wic/3rdparty/pykickstart/handlers/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/scripts/lib/mic/3rdparty/pykickstart/handlers/__init__.py
+++ b/scripts/lib/wic/3rdparty/pykickstart/handlers/__init__.py
diff --git a/scripts/lib/mic/3rdparty/pykickstart/handlers/control.py b/scripts/lib/wic/3rdparty/pykickstart/handlers/control.py
index 8dc80d1ebe..8dc80d1ebe 100644
--- a/scripts/lib/mic/3rdparty/pykickstart/handlers/control.py
+++ b/scripts/lib/wic/3rdparty/pykickstart/handlers/control.py
diff --git a/scripts/lib/mic/3rdparty/pykickstart/handlers/f16.py b/scripts/lib/wic/3rdparty/pykickstart/handlers/f16.py
index 3c52f8d754..3c52f8d754 100644
--- a/scripts/lib/mic/3rdparty/pykickstart/handlers/f16.py
+++ b/scripts/lib/wic/3rdparty/pykickstart/handlers/f16.py
diff --git a/scripts/lib/mic/3rdparty/pykickstart/ko.py b/scripts/lib/wic/3rdparty/pykickstart/ko.py
index 1350d19c70..1350d19c70 100644
--- a/scripts/lib/mic/3rdparty/pykickstart/ko.py
+++ b/scripts/lib/wic/3rdparty/pykickstart/ko.py
diff --git a/scripts/lib/mic/3rdparty/pykickstart/options.py b/scripts/lib/wic/3rdparty/pykickstart/options.py
index 341c5d7298..341c5d7298 100644
--- a/scripts/lib/mic/3rdparty/pykickstart/options.py
+++ b/scripts/lib/wic/3rdparty/pykickstart/options.py
diff --git a/scripts/lib/mic/3rdparty/pykickstart/parser.py b/scripts/lib/wic/3rdparty/pykickstart/parser.py
index 840a448673..840a448673 100644
--- a/scripts/lib/mic/3rdparty/pykickstart/parser.py
+++ b/scripts/lib/wic/3rdparty/pykickstart/parser.py
diff --git a/scripts/lib/mic/3rdparty/pykickstart/sections.py b/scripts/lib/wic/3rdparty/pykickstart/sections.py
index 44df856b8d..44df856b8d 100644
--- a/scripts/lib/mic/3rdparty/pykickstart/sections.py
+++ b/scripts/lib/wic/3rdparty/pykickstart/sections.py
diff --git a/scripts/lib/mic/3rdparty/pykickstart/version.py b/scripts/lib/wic/3rdparty/pykickstart/version.py
index 102cc37d80..102cc37d80 100644
--- a/scripts/lib/mic/3rdparty/pykickstart/version.py
+++ b/scripts/lib/wic/3rdparty/pykickstart/version.py
diff --git a/scripts/lib/mic/__init__.py b/scripts/lib/wic/__init__.py
index 63c1d9c846..63c1d9c846 100644
--- a/scripts/lib/mic/__init__.py
+++ b/scripts/lib/wic/__init__.py
diff --git a/scripts/lib/mic/__version__.py b/scripts/lib/wic/__version__.py
index 60d7626cac..60d7626cac 100644
--- a/scripts/lib/mic/__version__.py
+++ b/scripts/lib/wic/__version__.py
diff --git a/scripts/lib/mic/conf.py b/scripts/lib/wic/conf.py
index a686e9caa7..d5419f8e94 100644
--- a/scripts/lib/mic/conf.py
+++ b/scripts/lib/wic/conf.py
@@ -18,15 +18,15 @@
18import os, sys, re 18import os, sys, re
19import ConfigParser 19import ConfigParser
20 20
21from mic import msger 21from wic import msger
22from mic import kickstart 22from wic import kickstart
23from mic.utils import misc, runner, errors 23from wic.utils import misc, runner, errors
24 24
25 25
26def get_siteconf(): 26def get_siteconf():
27 mic_path = os.path.dirname(__file__) 27 wic_path = os.path.dirname(__file__)
28 eos = mic_path.find('scripts') + len('scripts') 28 eos = wic_path.find('scripts') + len('scripts')
29 scripts_path = mic_path[:eos] 29 scripts_path = wic_path[:eos]
30 30
31 return scripts_path + "/lib/image/config/wic.conf" 31 return scripts_path + "/lib/image/config/wic.conf"
32 32
diff --git a/scripts/lib/mic/creator.py b/scripts/lib/wic/creator.py
index 7c9ca6f9dc..a4b19ac6e0 100644
--- a/scripts/lib/mic/creator.py
+++ b/scripts/lib/wic/creator.py
@@ -18,10 +18,10 @@
18import os, sys, re 18import os, sys, re
19from optparse import SUPPRESS_HELP 19from optparse import SUPPRESS_HELP
20 20
21from mic import msger 21from wic import msger
22from mic.utils import cmdln, errors 22from wic.utils import cmdln, errors
23from mic.conf import configmgr 23from wic.conf import configmgr
24from mic.plugin import pluginmgr 24from wic.plugin import pluginmgr
25 25
26 26
27class Creator(cmdln.Cmdln): 27class Creator(cmdln.Cmdln):
@@ -34,7 +34,7 @@ class Creator(cmdln.Cmdln):
34 ${option_list} 34 ${option_list}
35 """ 35 """
36 36
37 name = 'mic create(cr)' 37 name = 'wic create(cr)'
38 38
39 def __init__(self, *args, **kwargs): 39 def __init__(self, *args, **kwargs):
40 cmdln.Cmdln.__init__(self, *args, **kwargs) 40 cmdln.Cmdln.__init__(self, *args, **kwargs)
@@ -64,7 +64,7 @@ class Creator(cmdln.Cmdln):
64 help='Path of logfile') 64 help='Path of logfile')
65 optparser.add_option('-c', '--config', type='string', dest='config', 65 optparser.add_option('-c', '--config', type='string', dest='config',
66 default=None, 66 default=None,
67 help='Specify config file for mic') 67 help='Specify config file for wic')
68 optparser.add_option('-o', '--outdir', type='string', action='store', 68 optparser.add_option('-o', '--outdir', type='string', action='store',
69 dest='outdir', default=None, 69 dest='outdir', default=None,
70 help='Output directory') 70 help='Output directory')
diff --git a/scripts/lib/mic/imager/__init__.py b/scripts/lib/wic/imager/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/scripts/lib/mic/imager/__init__.py
+++ b/scripts/lib/wic/imager/__init__.py
diff --git a/scripts/lib/mic/imager/baseimager.py b/scripts/lib/wic/imager/baseimager.py
index 23919d4cfa..5bcd2f7529 100644
--- a/scripts/lib/mic/imager/baseimager.py
+++ b/scripts/lib/wic/imager/baseimager.py
@@ -21,10 +21,10 @@ import os, sys
21import tempfile 21import tempfile
22import shutil 22import shutil
23 23
24from mic import kickstart 24from wic import kickstart
25from mic import msger 25from wic import msger
26from mic.utils.errors import CreatorError 26from wic.utils.errors import CreatorError
27from mic.utils import misc, runner, fs_related as fs 27from wic.utils import misc, runner, fs_related as fs
28 28
29class BaseImageCreator(object): 29class BaseImageCreator(object):
30 """Base class for image creation. 30 """Base class for image creation.
@@ -34,7 +34,7 @@ class BaseImageCreator(object):
34 34
35 e.g. 35 e.g.
36 36
37 import mic.imgcreate as imgcreate 37 import wic.imgcreate as imgcreate
38 ks = imgcreate.read_kickstart("foo.ks") 38 ks = imgcreate.read_kickstart("foo.ks")
39 imgcreate.ImageCreator(ks, "foo").create() 39 imgcreate.ImageCreator(ks, "foo").create()
40 """ 40 """
diff --git a/scripts/lib/mic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index 2f2bd4e072..5b12856289 100644
--- a/scripts/lib/mic/imager/direct.py
+++ b/scripts/lib/wic/imager/direct.py
@@ -18,8 +18,7 @@
18# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 18# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19# 19#
20# DESCRIPTION 20# DESCRIPTION
21# This implements the 'direct' image creator class for 'wic', based 21# This implements the 'direct' image creator class for 'wic'
22# loosely on the raw image creator from 'mic'
23# 22#
24# AUTHORS 23# AUTHORS
25# Tom Zanussi <tom.zanussi (at] linux.intel.com> 24# Tom Zanussi <tom.zanussi (at] linux.intel.com>
@@ -29,13 +28,13 @@ import os
29import stat 28import stat
30import shutil 29import shutil
31 30
32from mic import kickstart, msger 31from wic import kickstart, msger
33from mic.utils import fs_related, runner, misc 32from wic.utils import fs_related, runner, misc
34from mic.utils.partitionedfs import Image 33from wic.utils.partitionedfs import Image
35from mic.utils.errors import CreatorError, ImageError 34from wic.utils.errors import CreatorError, ImageError
36from mic.imager.baseimager import BaseImageCreator 35from wic.imager.baseimager import BaseImageCreator
37from mic.utils.oe.misc import * 36from wic.utils.oe.misc import *
38from mic.plugin import pluginmgr 37from wic.plugin import pluginmgr
39 38
40disk_methods = { 39disk_methods = {
41 "do_install_disk":None, 40 "do_install_disk":None,
diff --git a/scripts/lib/mic/kickstart/__init__.py b/scripts/lib/wic/kickstart/__init__.py
index 590bf4728f..4f5b778b5d 100644
--- a/scripts/lib/mic/kickstart/__init__.py
+++ b/scripts/lib/wic/kickstart/__init__.py
@@ -30,8 +30,8 @@ import pykickstart.version as ksversion
30from pykickstart.handlers.control import commandMap 30from pykickstart.handlers.control import commandMap
31from pykickstart.handlers.control import dataMap 31from pykickstart.handlers.control import dataMap
32 32
33from mic import msger 33from wic import msger
34from mic.utils import errors, misc, runner, fs_related as fs 34from wic.utils import errors, misc, runner, fs_related as fs
35from custom_commands import wicboot, partition 35from custom_commands import wicboot, partition
36 36
37def read_kickstart(path): 37def read_kickstart(path):
diff --git a/scripts/lib/mic/kickstart/custom_commands/__init__.py b/scripts/lib/wic/kickstart/custom_commands/__init__.py
index f84c6d9e00..f84c6d9e00 100644
--- a/scripts/lib/mic/kickstart/custom_commands/__init__.py
+++ b/scripts/lib/wic/kickstart/custom_commands/__init__.py
diff --git a/scripts/lib/mic/kickstart/custom_commands/micboot.py b/scripts/lib/wic/kickstart/custom_commands/micboot.py
index 66d1678aa7..66d1678aa7 100644
--- a/scripts/lib/mic/kickstart/custom_commands/micboot.py
+++ b/scripts/lib/wic/kickstart/custom_commands/micboot.py
diff --git a/scripts/lib/mic/kickstart/custom_commands/micpartition.py b/scripts/lib/wic/kickstart/custom_commands/micpartition.py
index 59a87fb486..59a87fb486 100644
--- a/scripts/lib/mic/kickstart/custom_commands/micpartition.py
+++ b/scripts/lib/wic/kickstart/custom_commands/micpartition.py
diff --git a/scripts/lib/mic/kickstart/custom_commands/partition.py b/scripts/lib/wic/kickstart/custom_commands/partition.py
index 101b90ef10..24f523ae41 100644
--- a/scripts/lib/mic/kickstart/custom_commands/partition.py
+++ b/scripts/lib/wic/kickstart/custom_commands/partition.py
@@ -29,9 +29,9 @@ import os
29import tempfile 29import tempfile
30 30
31from pykickstart.commands.partition import * 31from pykickstart.commands.partition import *
32from mic.utils.oe.misc import * 32from wic.utils.oe.misc import *
33from mic.kickstart.custom_commands import * 33from wic.kickstart.custom_commands import *
34from mic.plugin import pluginmgr 34from wic.plugin import pluginmgr
35 35
36partition_methods = { 36partition_methods = {
37 "do_stage_partition":None, 37 "do_stage_partition":None,
diff --git a/scripts/lib/mic/kickstart/custom_commands/wicboot.py b/scripts/lib/wic/kickstart/custom_commands/wicboot.py
index ab8871de4e..f1914169d8 100644
--- a/scripts/lib/mic/kickstart/custom_commands/wicboot.py
+++ b/scripts/lib/wic/kickstart/custom_commands/wicboot.py
@@ -29,7 +29,7 @@ from pykickstart.errors import *
29from pykickstart.options import * 29from pykickstart.options import *
30from pykickstart.commands.bootloader import * 30from pykickstart.commands.bootloader import *
31 31
32from mic.kickstart.custom_commands.micboot import * 32from wic.kickstart.custom_commands.micboot import *
33 33
34class Wic_Bootloader(Mic_Bootloader): 34class Wic_Bootloader(Mic_Bootloader):
35 def __init__(self, writePriority=10, appendLine="", driveorder=None, 35 def __init__(self, writePriority=10, appendLine="", driveorder=None,
diff --git a/scripts/lib/mic/msger.py b/scripts/lib/wic/msger.py
index 9afc85be93..9afc85be93 100644
--- a/scripts/lib/mic/msger.py
+++ b/scripts/lib/wic/msger.py
diff --git a/scripts/lib/mic/plugin.py b/scripts/lib/wic/plugin.py
index 43afdbc2f2..61c5859bac 100644
--- a/scripts/lib/mic/plugin.py
+++ b/scripts/lib/wic/plugin.py
@@ -17,16 +17,16 @@
17 17
18import os, sys 18import os, sys
19 19
20from mic import msger 20from wic import msger
21from mic import pluginbase 21from wic import pluginbase
22from mic.utils import errors 22from wic.utils import errors
23from mic.utils.oe.misc import * 23from wic.utils.oe.misc import *
24 24
25__ALL__ = ['PluginMgr', 'pluginmgr'] 25__ALL__ = ['PluginMgr', 'pluginmgr']
26 26
27PLUGIN_TYPES = ["imager", "source"] 27PLUGIN_TYPES = ["imager", "source"]
28 28
29PLUGIN_DIR = "/lib/mic/plugins" # relative to scripts 29PLUGIN_DIR = "/lib/wic/plugins" # relative to scripts
30SCRIPTS_PLUGIN_DIR = "scripts" + PLUGIN_DIR 30SCRIPTS_PLUGIN_DIR = "scripts" + PLUGIN_DIR
31 31
32class PluginMgr(object): 32class PluginMgr(object):
@@ -41,9 +41,9 @@ class PluginMgr(object):
41 return cls._instance 41 return cls._instance
42 42
43 def __init__(self): 43 def __init__(self):
44 mic_path = os.path.dirname(__file__) 44 wic_path = os.path.dirname(__file__)
45 eos = mic_path.find('scripts') + len('scripts') 45 eos = wic_path.find('scripts') + len('scripts')
46 scripts_path = mic_path[:eos] 46 scripts_path = wic_path[:eos]
47 self.scripts_path = scripts_path 47 self.scripts_path = scripts_path
48 self.plugin_dir = scripts_path + PLUGIN_DIR 48 self.plugin_dir = scripts_path + PLUGIN_DIR
49 self.layers_path = None 49 self.layers_path = None
diff --git a/scripts/lib/mic/pluginbase.py b/scripts/lib/wic/pluginbase.py
index 46a4f4a6b6..06f318f624 100644
--- a/scripts/lib/mic/pluginbase.py
+++ b/scripts/lib/wic/pluginbase.py
@@ -17,8 +17,8 @@
17 17
18import os 18import os
19import shutil 19import shutil
20from mic import msger 20from wic import msger
21from mic.utils import errors 21from wic.utils import errors
22 22
23class _Plugin(object): 23class _Plugin(object):
24 class __metaclass__(type): 24 class __metaclass__(type):
@@ -26,15 +26,15 @@ class _Plugin(object):
26 if not hasattr(cls, 'plugins'): 26 if not hasattr(cls, 'plugins'):
27 cls.plugins = {} 27 cls.plugins = {}
28 28
29 elif 'mic_plugin_type' in attrs: 29 elif 'wic_plugin_type' in attrs:
30 if attrs['mic_plugin_type'] not in cls.plugins: 30 if attrs['wic_plugin_type'] not in cls.plugins:
31 cls.plugins[attrs['mic_plugin_type']] = {} 31 cls.plugins[attrs['wic_plugin_type']] = {}
32 32
33 elif hasattr(cls, 'mic_plugin_type') and 'name' in attrs: 33 elif hasattr(cls, 'wic_plugin_type') and 'name' in attrs:
34 cls.plugins[cls.mic_plugin_type][attrs['name']] = cls 34 cls.plugins[cls.wic_plugin_type][attrs['name']] = cls
35 35
36 def show_plugins(cls): 36 def show_plugins(cls):
37 for cls in cls.plugins[cls.mic_plugin_type]: 37 for cls in cls.plugins[cls.wic_plugin_type]:
38 print cls 38 print cls
39 39
40 def get_plugins(cls): 40 def get_plugins(cls):
@@ -42,11 +42,11 @@ class _Plugin(object):
42 42
43 43
44class ImagerPlugin(_Plugin): 44class ImagerPlugin(_Plugin):
45 mic_plugin_type = "imager" 45 wic_plugin_type = "imager"
46 46
47 47
48class SourcePlugin(_Plugin): 48class SourcePlugin(_Plugin):
49 mic_plugin_type = "source" 49 wic_plugin_type = "source"
50 """ 50 """
51 The methods that can be implemented by --source plugins. 51 The methods that can be implemented by --source plugins.
52 52
diff --git a/scripts/lib/mic/plugins/imager/direct_plugin.py b/scripts/lib/wic/plugins/imager/direct_plugin.py
index c05a400768..dabd6fc3e0 100644
--- a/scripts/lib/mic/plugins/imager/direct_plugin.py
+++ b/scripts/lib/wic/plugins/imager/direct_plugin.py
@@ -18,8 +18,7 @@
18# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 18# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19# 19#
20# DESCRIPTION 20# DESCRIPTION
21# This implements the 'direct' imager plugin class for 'wic', based 21# This implements the 'direct' imager plugin class for 'wic'
22# loosely on the raw imager plugin from 'mic'
23# 22#
24# AUTHORS 23# AUTHORS
25# Tom Zanussi <tom.zanussi (at] linux.intel.com> 24# Tom Zanussi <tom.zanussi (at] linux.intel.com>
@@ -30,13 +29,13 @@ import shutil
30import re 29import re
31import tempfile 30import tempfile
32 31
33from mic import msger 32from wic import msger
34from mic.utils import misc, fs_related, errors, runner, cmdln 33from wic.utils import misc, fs_related, errors, runner, cmdln
35from mic.conf import configmgr 34from wic.conf import configmgr
36from mic.plugin import pluginmgr 35from wic.plugin import pluginmgr
37 36
38import mic.imager.direct as direct 37import wic.imager.direct as direct
39from mic.pluginbase import ImagerPlugin 38from wic.pluginbase import ImagerPlugin
40 39
41class DirectPlugin(ImagerPlugin): 40class DirectPlugin(ImagerPlugin):
42 name = 'direct' 41 name = 'direct'
diff --git a/scripts/lib/mic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 5b1a5332c4..53f1782381 100644
--- a/scripts/lib/mic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -29,14 +29,14 @@ import shutil
29import re 29import re
30import tempfile 30import tempfile
31 31
32from mic import kickstart, msger 32from wic import kickstart, msger
33from mic.utils import misc, fs_related, errors, runner, cmdln 33from wic.utils import misc, fs_related, errors, runner, cmdln
34from mic.conf import configmgr 34from wic.conf import configmgr
35from mic.plugin import pluginmgr 35from wic.plugin import pluginmgr
36import mic.imager.direct as direct 36import wic.imager.direct as direct
37from mic.pluginbase import SourcePlugin 37from wic.pluginbase import SourcePlugin
38from mic.utils.oe.misc import * 38from wic.utils.oe.misc import *
39from mic.imager.direct import DirectImageCreator 39from wic.imager.direct import DirectImageCreator
40 40
41class BootimgEFIPlugin(SourcePlugin): 41class BootimgEFIPlugin(SourcePlugin):
42 name = 'bootimg-efi' 42 name = 'bootimg-efi'
diff --git a/scripts/lib/mic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index 959cf411bf..bd2225eeaf 100644
--- a/scripts/lib/mic/plugins/source/bootimg-pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -29,14 +29,14 @@ import shutil
29import re 29import re
30import tempfile 30import tempfile
31 31
32from mic import kickstart, msger 32from wic import kickstart, msger
33from mic.utils import misc, fs_related, errors, runner, cmdln 33from wic.utils import misc, fs_related, errors, runner, cmdln
34from mic.conf import configmgr 34from wic.conf import configmgr
35from mic.plugin import pluginmgr 35from wic.plugin import pluginmgr
36import mic.imager.direct as direct 36import wic.imager.direct as direct
37from mic.pluginbase import SourcePlugin 37from wic.pluginbase import SourcePlugin
38from mic.utils.oe.misc import * 38from wic.utils.oe.misc import *
39from mic.imager.direct import DirectImageCreator 39from wic.imager.direct import DirectImageCreator
40 40
41class BootimgPcbiosPlugin(SourcePlugin): 41class BootimgPcbiosPlugin(SourcePlugin):
42 name = 'bootimg-pcbios' 42 name = 'bootimg-pcbios'
diff --git a/scripts/lib/mic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py
index 8ebf62c10b..919e97e6b6 100644
--- a/scripts/lib/mic/plugins/source/rootfs.py
+++ b/scripts/lib/wic/plugins/source/rootfs.py
@@ -30,14 +30,14 @@ import shutil
30import re 30import re
31import tempfile 31import tempfile
32 32
33from mic import kickstart, msger 33from wic import kickstart, msger
34from mic.utils import misc, fs_related, errors, runner, cmdln 34from wic.utils import misc, fs_related, errors, runner, cmdln
35from mic.conf import configmgr 35from wic.conf import configmgr
36from mic.plugin import pluginmgr 36from wic.plugin import pluginmgr
37import mic.imager.direct as direct 37import wic.imager.direct as direct
38from mic.pluginbase import SourcePlugin 38from wic.pluginbase import SourcePlugin
39from mic.utils.oe.misc import * 39from wic.utils.oe.misc import *
40from mic.imager.direct import DirectImageCreator 40from wic.imager.direct import DirectImageCreator
41 41
42class RootfsPlugin(SourcePlugin): 42class RootfsPlugin(SourcePlugin):
43 name = 'rootfs' 43 name = 'rootfs'
diff --git a/scripts/lib/mic/test b/scripts/lib/wic/test
index 9daeafb986..9daeafb986 100644
--- a/scripts/lib/mic/test
+++ b/scripts/lib/wic/test
diff --git a/scripts/lib/mic/utils/__init__.py b/scripts/lib/wic/utils/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/scripts/lib/mic/utils/__init__.py
+++ b/scripts/lib/wic/utils/__init__.py
diff --git a/scripts/lib/mic/utils/cmdln.py b/scripts/lib/wic/utils/cmdln.py
index b099473ee4..b099473ee4 100644
--- a/scripts/lib/mic/utils/cmdln.py
+++ b/scripts/lib/wic/utils/cmdln.py
diff --git a/scripts/lib/mic/utils/errors.py b/scripts/lib/wic/utils/errors.py
index 86e230ac19..86e230ac19 100644
--- a/scripts/lib/mic/utils/errors.py
+++ b/scripts/lib/wic/utils/errors.py
diff --git a/scripts/lib/mic/utils/fs_related.py b/scripts/lib/wic/utils/fs_related.py
index cf2a759a06..79cc1d52a7 100644
--- a/scripts/lib/mic/utils/fs_related.py
+++ b/scripts/lib/wic/utils/fs_related.py
@@ -26,10 +26,10 @@ import string
26import time 26import time
27import uuid 27import uuid
28 28
29from mic import msger 29from wic import msger
30from mic.utils import runner 30from wic.utils import runner
31from mic.utils.errors import * 31from wic.utils.errors import *
32from mic.utils.oe.misc import * 32from wic.utils.oe.misc import *
33 33
34def find_binary_path(binary): 34def find_binary_path(binary):
35 if os.environ.has_key("PATH"): 35 if os.environ.has_key("PATH"):
diff --git a/scripts/lib/mic/utils/misc.py b/scripts/lib/wic/utils/misc.py
index 194b88f691..194b88f691 100644
--- a/scripts/lib/mic/utils/misc.py
+++ b/scripts/lib/wic/utils/misc.py
diff --git a/scripts/lib/mic/utils/oe/__init__.py b/scripts/lib/wic/utils/oe/__init__.py
index d10e802116..0a81575a74 100644
--- a/scripts/lib/mic/utils/oe/__init__.py
+++ b/scripts/lib/wic/utils/oe/__init__.py
@@ -1,5 +1,5 @@
1# 1#
2# OpenEmbedded mic utils library 2# OpenEmbedded wic utils library
3# 3#
4# Copyright (c) 2013, Intel Corporation. 4# Copyright (c) 2013, Intel Corporation.
5# All rights reserved. 5# All rights reserved.
diff --git a/scripts/lib/mic/utils/oe/misc.py b/scripts/lib/wic/utils/oe/misc.py
index bed275090d..87e30411b0 100644
--- a/scripts/lib/mic/utils/oe/misc.py
+++ b/scripts/lib/wic/utils/oe/misc.py
@@ -18,15 +18,15 @@
18# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 18# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19# 19#
20# DESCRIPTION 20# DESCRIPTION
21# This module provides a place to collect various mic-related utils 21# This module provides a place to collect various wic-related utils
22# for the OpenEmbedded Image Tools. 22# for the OpenEmbedded Image Tools.
23# 23#
24# AUTHORS 24# AUTHORS
25# Tom Zanussi <tom.zanussi (at] linux.intel.com> 25# Tom Zanussi <tom.zanussi (at] linux.intel.com>
26# 26#
27 27
28from mic import msger 28from wic import msger
29from mic.utils import runner 29from wic.utils import runner
30 30
31def __exec_cmd(cmd_and_args, as_shell = False, catch = 3): 31def __exec_cmd(cmd_and_args, as_shell = False, catch = 3):
32 """ 32 """
diff --git a/scripts/lib/mic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
index 68e4cabbe0..76aa42135b 100644
--- a/scripts/lib/mic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -20,11 +20,11 @@
20 20
21import os 21import os
22 22
23from mic import msger 23from wic import msger
24from mic.utils import runner 24from wic.utils import runner
25from mic.utils.errors import ImageError 25from wic.utils.errors import ImageError
26from mic.utils.fs_related import * 26from wic.utils.fs_related import *
27from mic.utils.oe.misc import * 27from wic.utils.oe.misc import *
28 28
29# Overhead of the MBR partitioning scheme (just one sector) 29# Overhead of the MBR partitioning scheme (just one sector)
30MBR_OVERHEAD = 1 30MBR_OVERHEAD = 1
diff --git a/scripts/lib/mic/utils/runner.py b/scripts/lib/wic/utils/runner.py
index fded3c93fa..e740dad253 100644
--- a/scripts/lib/mic/utils/runner.py
+++ b/scripts/lib/wic/utils/runner.py
@@ -18,7 +18,7 @@
18import os 18import os
19import subprocess 19import subprocess
20 20
21from mic import msger 21from wic import msger
22 22
23def runtool(cmdln_or_args, catch=1): 23def runtool(cmdln_or_args, catch=1):
24 """ wrapper for most of the subprocess calls 24 """ wrapper for most of the subprocess calls