diff options
author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2013-10-22 09:23:58 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-23 07:14:10 +0100 |
commit | c4a4fc524cde719b3afd21d216695142d55fac67 (patch) | |
tree | cf428e9ae9ecbac89def65b80bed7a429099abc6 | |
parent | db034f07bfc47d930e68f967e0fb1f4516aae889 (diff) | |
download | poky-c4a4fc524cde719b3afd21d216695142d55fac67.tar.gz |
wic: Remove dependency on rpmmisc
rpmmisc imports rpm and contains misc rpm utilities related to
packaging and determining arches based on the packaging. We should
never run across this in the initial version of wic, so remove the
dependency.
(From OE-Core rev: 2d59b6eeb418cf23eef3e32b43354b4ab16a40b9)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | scripts/lib/mic/creator.py | 2 | ||||
-rw-r--r-- | scripts/lib/mic/imager/livecd.py | 2 | ||||
-rw-r--r-- | scripts/lib/mic/utils/misc.py | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/scripts/lib/mic/creator.py b/scripts/lib/mic/creator.py index b36bbf064a..267928f877 100644 --- a/scripts/lib/mic/creator.py +++ b/scripts/lib/mic/creator.py | |||
@@ -19,7 +19,7 @@ import os, sys, re | |||
19 | from optparse import SUPPRESS_HELP | 19 | from optparse import SUPPRESS_HELP |
20 | 20 | ||
21 | from mic import msger | 21 | from mic import msger |
22 | from mic.utils import cmdln, errors, rpmmisc | 22 | from mic.utils import cmdln, errors |
23 | from mic.conf import configmgr | 23 | from mic.conf import configmgr |
24 | from mic.plugin import pluginmgr | 24 | from mic.plugin import pluginmgr |
25 | 25 | ||
diff --git a/scripts/lib/mic/imager/livecd.py b/scripts/lib/mic/imager/livecd.py index a992ee0706..07115526bd 100644 --- a/scripts/lib/mic/imager/livecd.py +++ b/scripts/lib/mic/imager/livecd.py | |||
@@ -20,7 +20,7 @@ import glob | |||
20 | import shutil | 20 | import shutil |
21 | 21 | ||
22 | from mic import kickstart, msger | 22 | from mic import kickstart, msger |
23 | from mic.utils import fs_related, rpmmisc, runner, misc | 23 | from mic.utils import fs_related, runner, misc |
24 | from mic.utils.errors import CreatorError | 24 | from mic.utils.errors import CreatorError |
25 | from mic.imager.loop import LoopImageCreator | 25 | from mic.imager.loop import LoopImageCreator |
26 | 26 | ||
diff --git a/scripts/lib/mic/utils/misc.py b/scripts/lib/mic/utils/misc.py index 67ddef2e44..2c4a3ac307 100644 --- a/scripts/lib/mic/utils/misc.py +++ b/scripts/lib/mic/utils/misc.py | |||
@@ -45,7 +45,6 @@ from mic.utils.fs_related import find_binary_path, makedirs | |||
45 | from mic.utils.grabber import myurlgrab | 45 | from mic.utils.grabber import myurlgrab |
46 | from mic.utils.proxy import get_proxy_for | 46 | from mic.utils.proxy import get_proxy_for |
47 | from mic.utils import runner | 47 | from mic.utils import runner |
48 | from mic.utils import rpmmisc | ||
49 | 48 | ||
50 | 49 | ||
51 | RPM_RE = re.compile("(.*)\.(.*) (.*)-(.*)") | 50 | RPM_RE = re.compile("(.*)\.(.*) (.*)-(.*)") |