summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2013-10-22 09:23:58 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-23 07:14:00 +0100
commit2d59b6eeb418cf23eef3e32b43354b4ab16a40b9 (patch)
tree58b55ec7e5961518ee116592879f5d6dfc9c508f
parent429c0d72b9b8bfed34832e283be92996e074b9ac (diff)
downloadopenembedded-core-2d59b6eeb418cf23eef3e32b43354b4ab16a40b9.tar.gz
openembedded-core-2d59b6eeb418cf23eef3e32b43354b4ab16a40b9.tar.bz2
openembedded-core-2d59b6eeb418cf23eef3e32b43354b4ab16a40b9.zip
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. 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.py2
-rw-r--r--scripts/lib/mic/imager/livecd.py2
-rw-r--r--scripts/lib/mic/utils/misc.py1
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
from optparse import SUPPRESS_HELP
from mic import msger
-from mic.utils import cmdln, errors, rpmmisc
+from mic.utils import cmdln, errors
from mic.conf import configmgr
from mic.plugin import pluginmgr
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
import shutil
from mic import kickstart, msger
-from mic.utils import fs_related, rpmmisc, runner, misc
+from mic.utils import fs_related, runner, misc
from mic.utils.errors import CreatorError
from mic.imager.loop import LoopImageCreator
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
from mic.utils.grabber import myurlgrab
from mic.utils.proxy import get_proxy_for
from mic.utils import runner
-from mic.utils import rpmmisc
RPM_RE = re.compile("(.*)\.(.*) (.*)-(.*)")