summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2013-10-22 09:23:56 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-12 16:59:58 +0000
commit3bcd49dddfe7526ec7cea5c0f2912365dec897f7 (patch)
treef701a1c1fd35e90d736ec97478dabba17d93aca6 /scripts
parent9e27361d815faf1a9e95d72997dfadd7d63f6c03 (diff)
downloadpoky-3bcd49dddfe7526ec7cea5c0f2912365dec897f7.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 master rev: 3103f0cb908eced7b751128c2bba898d12017c80) (From OE-Core rev: f338d696b7f865bdb10020f806c69c78e8ed6625) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/mic/creator.py2
-rw-r--r--scripts/lib/mic/plugins/imager/direct_plugin.py2
-rw-r--r--scripts/lib/mic/plugins/imager/fs_plugin.py2
-rw-r--r--scripts/lib/mic/plugins/imager/livecd_plugin.py2
-rw-r--r--scripts/lib/mic/plugins/imager/liveusb_plugin.py2
-rw-r--r--scripts/lib/mic/plugins/imager/loop_plugin.py2
-rw-r--r--scripts/lib/mic/plugins/imager/raw_plugin.py2
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 @@
18import os, sys, re 18import os, sys, re
19from optparse import SUPPRESS_HELP 19from optparse import SUPPRESS_HELP
20 20
21from mic import msger, rt_util 21from mic import msger
22from mic.utils import cmdln, errors, rpmmisc 22from mic.utils import cmdln, errors, rpmmisc
23from mic.conf import configmgr 23from mic.conf import configmgr
24from mic.plugin import pluginmgr 24from 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
30import re 30import re
31import tempfile 31import tempfile
32 32
33from mic import chroot, msger, rt_util 33from mic import chroot, msger
34from mic.utils import misc, fs_related, errors, runner, cmdln 34from mic.utils import misc, fs_related, errors, runner, cmdln
35from mic.conf import configmgr 35from mic.conf import configmgr
36from mic.plugin import pluginmgr 36from 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 @@
18import os 18import os
19import sys 19import sys
20 20
21from mic import chroot, msger, rt_util 21from mic import chroot, msger
22from mic.utils import cmdln, misc, errors, fs_related 22from mic.utils import cmdln, misc, errors, fs_related
23from mic.imager import fs 23from mic.imager import fs
24from mic.conf import configmgr 24from 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
19import shutil 19import shutil
20import tempfile 20import tempfile
21 21
22from mic import chroot, msger, rt_util 22from mic import chroot, msger
23from mic.utils import misc, fs_related, errors 23from mic.utils import misc, fs_related, errors
24from mic.conf import configmgr 24from mic.conf import configmgr
25import mic.imager.livecd as livecd 25import 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
19import shutil 19import shutil
20import tempfile 20import tempfile
21 21
22from mic import chroot, msger, rt_util 22from mic import chroot, msger
23from mic.utils import misc, fs_related, errors 23from mic.utils import misc, fs_related, errors
24from mic.utils.partitionedfs import PartitionedMount 24from mic.utils.partitionedfs import PartitionedMount
25from mic.conf import configmgr 25from 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
19import shutil 19import shutil
20import tempfile 20import tempfile
21 21
22from mic import chroot, msger, rt_util 22from mic import chroot, msger
23from mic.utils import misc, fs_related, errors, cmdln 23from mic.utils import misc, fs_related, errors, cmdln
24from mic.conf import configmgr 24from mic.conf import configmgr
25from mic.plugin import pluginmgr 25from 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
20import re 20import re
21import tempfile 21import tempfile
22 22
23from mic import chroot, msger, rt_util 23from mic import chroot, msger
24from mic.utils import misc, fs_related, errors, runner, cmdln 24from mic.utils import misc, fs_related, errors, runner, cmdln
25from mic.conf import configmgr 25from mic.conf import configmgr
26from mic.plugin import pluginmgr 26from mic.plugin import pluginmgr