summaryrefslogtreecommitdiffstats
path: root/scripts
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-12-12 16:59:59 +0000
commitff4aaa8508cf51279ddd70866a7daa84be7f86e0 (patch)
treea1ece003268f1112c866dd19ef7c379b4faab55e /scripts
parent7a5e6c4ec93793f0a16cc0bb0c8aa40283448b7d (diff)
downloadpoky-ff4aaa8508cf51279ddd70866a7daa84be7f86e0.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 master rev: 2d59b6eeb418cf23eef3e32b43354b4ab16a40b9) (From OE-Core rev: b16a9de9f5eb2d252ee263a4b2c66c74ff4ff78f) 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/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
19from optparse import SUPPRESS_HELP 19from optparse import SUPPRESS_HELP
20 20
21from mic import msger 21from mic import msger
22from mic.utils import cmdln, errors, rpmmisc 22from mic.utils import cmdln, errors
23from mic.conf import configmgr 23from mic.conf import configmgr
24from mic.plugin import pluginmgr 24from 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
20import shutil 20import shutil
21 21
22from mic import kickstart, msger 22from mic import kickstart, msger
23from mic.utils import fs_related, rpmmisc, runner, misc 23from mic.utils import fs_related, runner, misc
24from mic.utils.errors import CreatorError 24from mic.utils.errors import CreatorError
25from mic.imager.loop import LoopImageCreator 25from 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
45from mic.utils.grabber import myurlgrab 45from mic.utils.grabber import myurlgrab
46from mic.utils.proxy import get_proxy_for 46from mic.utils.proxy import get_proxy_for
47from mic.utils import runner 47from mic.utils import runner
48from mic.utils import rpmmisc
49 48
50 49
51RPM_RE = re.compile("(.*)\.(.*) (.*)-(.*)") 50RPM_RE = re.compile("(.*)\.(.*) (.*)-(.*)")