From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Tue, 22 Oct 2013 14:24:02 +0000 (-0500)
Subject: wic: Remove rpmmisc call from livecd
X-Git-Tag: 2015-4~4855
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=e10ae516cfc10900ed12e84c743e3a7127372135;p=openembedded-core.git

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.

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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
         self._configure_syslinux_bootloader(isodir)
         self._configure_efi_bootloader(isodir)
 
-arch = rpmmisc.getBaseArch()
+arch = "i386"
 if arch in ("i386", "x86_64"):
     LiveCDImageCreator = x86LiveImageCreator
 elif arch.startswith("arm"):