[oe-commits] Tom Zanussi : wic: Remove rpmmisc call from livecd

git at git.openembedded.org git at git.openembedded.org
Wed Oct 23 06:01:19 UTC 2013


Module: openembedded-core.git
Branch: master
Commit: e10ae516cfc10900ed12e84c743e3a7127372135
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e10ae516cfc10900ed12e84c743e3a7127372135

Author: Tom Zanussi <tom.zanussi at linux.intel.com>
Date:   Tue Oct 22 09:24:02 2013 -0500

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 at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 scripts/lib/mic/imager/livecd.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/lib/mic/imager/livecd.py b/scripts/lib/mic/imager/livecd.py
index 0711552..e36f4a7 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"):



More information about the Openembedded-commits mailing list