From 135385ed4c383dba74d57d959aeec7da02b6678c Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Tue, 22 Oct 2013 09:23:56 -0500 Subject: [PATCH] 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 Signed-off-by: Richard Purdie --- scripts/lib/mic/creator.py | 2 +- scripts/lib/mic/plugins/imager/direct_plugin.py | 2 +- scripts/lib/mic/plugins/imager/fs_plugin.py | 2 +- scripts/lib/mic/plugins/imager/livecd_plugin.py | 2 +- scripts/lib/mic/plugins/imager/liveusb_plugin.py | 2 +- scripts/lib/mic/plugins/imager/loop_plugin.py | 2 +- 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 f3d0de1..b36bbf0 100644 --- a/scripts/lib/mic/creator.py +++ b/scripts/lib/mic/creator.py @@ -18,7 +18,7 @@ import os, sys, re from optparse import SUPPRESS_HELP -from mic import msger, rt_util +from mic import msger from mic.utils import cmdln, errors, rpmmisc from mic.conf import configmgr 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 53381e5..e015256 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 import re import tempfile -from mic import chroot, msger, rt_util +from mic import chroot, msger from mic.utils import misc, fs_related, errors, runner, cmdln from mic.conf import configmgr 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 8e758db..6bcaf00 100644 --- a/scripts/lib/mic/plugins/imager/fs_plugin.py +++ b/scripts/lib/mic/plugins/imager/fs_plugin.py @@ -18,7 +18,7 @@ import os import sys -from mic import chroot, msger, rt_util +from mic import chroot, msger from mic.utils import cmdln, misc, errors, fs_related from mic.imager import fs 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 d24ef59..82cb1af 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 import shutil import tempfile -from mic import chroot, msger, rt_util +from mic import chroot, msger from mic.utils import misc, fs_related, errors from mic.conf import configmgr 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 7aa8927..3d53c84 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 import shutil import tempfile -from mic import chroot, msger, rt_util +from mic import chroot, msger from mic.utils import misc, fs_related, errors from mic.utils.partitionedfs import PartitionedMount 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 8f4b030..2a05b3c 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 import shutil import tempfile -from mic import chroot, msger, rt_util +from mic import chroot, msger from mic.utils import misc, fs_related, errors, cmdln from mic.conf import configmgr 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 1b9631d..f9625b8 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 import re import tempfile -from mic import chroot, msger, rt_util +from mic import chroot, msger from mic.utils import misc, fs_related, errors, runner, cmdln from mic.conf import configmgr from mic.plugin import pluginmgr -- 2.7.4