summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2013-10-22 09:24:02 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-23 07:14:12 +0100
commit51fdae503a07f3874baca7482a08353915c65cb0 (patch)
tree2aa93fa05095a52fd1017cc2cb7adb58b2beae42 /scripts/lib
parentf2ca93e61e575586b8a1589602812d11c4a1fc28 (diff)
downloadpoky-51fdae503a07f3874baca7482a08353915c65cb0.tar.gz
wic: Remove rpmmisc call from livecd
We don't currently use LiveCDImageCreator, but it makes calls when initialized via the plugin interface to rpmmisc module functions, which we don't want the dependency on. To make it (and LiveUSBImageCreator) happy, we give it the dummy "i386" value for now. (From OE-Core rev: e10ae516cfc10900ed12e84c743e3a7127372135) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/mic/imager/livecd.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/mic/imager/livecd.py b/scripts/lib/mic/imager/livecd.py
index 07115526bd..e36f4a76c6 100644
--- a/scripts/lib/mic/imager/livecd.py
+++ b/scripts/lib/mic/imager/livecd.py
@@ -741,7 +741,7 @@ hiddenmenu
741 self._configure_syslinux_bootloader(isodir) 741 self._configure_syslinux_bootloader(isodir)
742 self._configure_efi_bootloader(isodir) 742 self._configure_efi_bootloader(isodir)
743 743
744arch = rpmmisc.getBaseArch() 744arch = "i386"
745if arch in ("i386", "x86_64"): 745if arch in ("i386", "x86_64"):
746 LiveCDImageCreator = x86LiveImageCreator 746 LiveCDImageCreator = x86LiveImageCreator
747elif arch.startswith("arm"): 747elif arch.startswith("arm"):