diff options
author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2013-10-22 09:23:56 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-23 07:14:10 +0100 |
commit | ce2dabd393587a69ac9b5b01159186619041b6bc (patch) | |
tree | 2f2533a606f3b3a020db339c40e9dd85030d8ad9 /scripts/lib | |
parent | a7b1ff87d26aad7d784852a604826953177f6b4e (diff) | |
download | poky-ce2dabd393587a69ac9b5b01159186619041b6bc.tar.gz |
wic: Remove dependency on rt_util module
rt_util contains bootstrap_mic(), which imports rpm and other things
we don't need because we don't do bootstrap i.e. runtime (set in
wic.conf) is always set to 'native', which means use what's on the
local host.
bootstrap mode is for downloading and installing rpms that wic needs,
which we may want to implement later; for now, we just want to use
what's local.
(From OE-Core rev: 3103f0cb908eced7b751128c2bba898d12017c80)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r-- | scripts/lib/mic/creator.py | 2 | ||||
-rw-r--r-- | scripts/lib/mic/plugins/imager/direct_plugin.py | 2 | ||||
-rw-r--r-- | scripts/lib/mic/plugins/imager/fs_plugin.py | 2 | ||||
-rw-r--r-- | scripts/lib/mic/plugins/imager/livecd_plugin.py | 2 | ||||
-rw-r--r-- | scripts/lib/mic/plugins/imager/liveusb_plugin.py | 2 | ||||
-rw-r--r-- | scripts/lib/mic/plugins/imager/loop_plugin.py | 2 | ||||
-rw-r--r-- | scripts/lib/mic/plugins/imager/raw_plugin.py | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/scripts/lib/mic/creator.py b/scripts/lib/mic/creator.py index f3d0de19fc..b36bbf064a 100644 --- a/scripts/lib/mic/creator.py +++ b/scripts/lib/mic/creator.py | |||
@@ -18,7 +18,7 @@ | |||
18 | import os, sys, re | 18 | import os, sys, re |
19 | from optparse import SUPPRESS_HELP | 19 | from optparse import SUPPRESS_HELP |
20 | 20 | ||
21 | from mic import msger, rt_util | 21 | from mic import msger |
22 | from mic.utils import cmdln, errors, rpmmisc | 22 | from mic.utils import cmdln, errors, rpmmisc |
23 | from mic.conf import configmgr | 23 | from mic.conf import configmgr |
24 | from mic.plugin import pluginmgr | 24 | from mic.plugin import pluginmgr |
diff --git a/scripts/lib/mic/plugins/imager/direct_plugin.py b/scripts/lib/mic/plugins/imager/direct_plugin.py index 53381e5e01..e015256fa1 100644 --- a/scripts/lib/mic/plugins/imager/direct_plugin.py +++ b/scripts/lib/mic/plugins/imager/direct_plugin.py | |||
@@ -30,7 +30,7 @@ import shutil | |||
30 | import re | 30 | import re |
31 | import tempfile | 31 | import tempfile |
32 | 32 | ||
33 | from mic import chroot, msger, rt_util | 33 | from mic import chroot, msger |
34 | from mic.utils import misc, fs_related, errors, runner, cmdln | 34 | from mic.utils import misc, fs_related, errors, runner, cmdln |
35 | from mic.conf import configmgr | 35 | from mic.conf import configmgr |
36 | from mic.plugin import pluginmgr | 36 | from mic.plugin import pluginmgr |
diff --git a/scripts/lib/mic/plugins/imager/fs_plugin.py b/scripts/lib/mic/plugins/imager/fs_plugin.py index 8e758db544..6bcaf00729 100644 --- a/scripts/lib/mic/plugins/imager/fs_plugin.py +++ b/scripts/lib/mic/plugins/imager/fs_plugin.py | |||
@@ -18,7 +18,7 @@ | |||
18 | import os | 18 | import os |
19 | import sys | 19 | import sys |
20 | 20 | ||
21 | from mic import chroot, msger, rt_util | 21 | from mic import chroot, msger |
22 | from mic.utils import cmdln, misc, errors, fs_related | 22 | from mic.utils import cmdln, misc, errors, fs_related |
23 | from mic.imager import fs | 23 | from mic.imager import fs |
24 | from mic.conf import configmgr | 24 | from mic.conf import configmgr |
diff --git a/scripts/lib/mic/plugins/imager/livecd_plugin.py b/scripts/lib/mic/plugins/imager/livecd_plugin.py index d24ef59264..82cb1af7dc 100644 --- a/scripts/lib/mic/plugins/imager/livecd_plugin.py +++ b/scripts/lib/mic/plugins/imager/livecd_plugin.py | |||
@@ -19,7 +19,7 @@ import os | |||
19 | import shutil | 19 | import shutil |
20 | import tempfile | 20 | import tempfile |
21 | 21 | ||
22 | from mic import chroot, msger, rt_util | 22 | from mic import chroot, msger |
23 | from mic.utils import misc, fs_related, errors | 23 | from mic.utils import misc, fs_related, errors |
24 | from mic.conf import configmgr | 24 | from mic.conf import configmgr |
25 | import mic.imager.livecd as livecd | 25 | import mic.imager.livecd as livecd |
diff --git a/scripts/lib/mic/plugins/imager/liveusb_plugin.py b/scripts/lib/mic/plugins/imager/liveusb_plugin.py index 7aa8927df9..3d53c84410 100644 --- a/scripts/lib/mic/plugins/imager/liveusb_plugin.py +++ b/scripts/lib/mic/plugins/imager/liveusb_plugin.py | |||
@@ -19,7 +19,7 @@ import os | |||
19 | import shutil | 19 | import shutil |
20 | import tempfile | 20 | import tempfile |
21 | 21 | ||
22 | from mic import chroot, msger, rt_util | 22 | from mic import chroot, msger |
23 | from mic.utils import misc, fs_related, errors | 23 | from mic.utils import misc, fs_related, errors |
24 | from mic.utils.partitionedfs import PartitionedMount | 24 | from mic.utils.partitionedfs import PartitionedMount |
25 | from mic.conf import configmgr | 25 | from mic.conf import configmgr |
diff --git a/scripts/lib/mic/plugins/imager/loop_plugin.py b/scripts/lib/mic/plugins/imager/loop_plugin.py index 8f4b030f6b..2a05b3c238 100644 --- a/scripts/lib/mic/plugins/imager/loop_plugin.py +++ b/scripts/lib/mic/plugins/imager/loop_plugin.py | |||
@@ -19,7 +19,7 @@ import os | |||
19 | import shutil | 19 | import shutil |
20 | import tempfile | 20 | import tempfile |
21 | 21 | ||
22 | from mic import chroot, msger, rt_util | 22 | from mic import chroot, msger |
23 | from mic.utils import misc, fs_related, errors, cmdln | 23 | from mic.utils import misc, fs_related, errors, cmdln |
24 | from mic.conf import configmgr | 24 | from mic.conf import configmgr |
25 | from mic.plugin import pluginmgr | 25 | from mic.plugin import pluginmgr |
diff --git a/scripts/lib/mic/plugins/imager/raw_plugin.py b/scripts/lib/mic/plugins/imager/raw_plugin.py index 1b9631dfa2..f9625b87e8 100644 --- a/scripts/lib/mic/plugins/imager/raw_plugin.py +++ b/scripts/lib/mic/plugins/imager/raw_plugin.py | |||
@@ -20,7 +20,7 @@ import shutil | |||
20 | import re | 20 | import re |
21 | import tempfile | 21 | import tempfile |
22 | 22 | ||
23 | from mic import chroot, msger, rt_util | 23 | from mic import chroot, msger |
24 | from mic.utils import misc, fs_related, errors, runner, cmdln | 24 | from mic.utils import misc, fs_related, errors, runner, cmdln |
25 | from mic.conf import configmgr | 25 | from mic.conf import configmgr |
26 | from mic.plugin import pluginmgr | 26 | from mic.plugin import pluginmgr |