]> code.ossystems Code Review - openembedded-core.git/commitdiff
wic: Remove rpmmisc call from livecd
authorTom Zanussi <tom.zanussi@linux.intel.com>
Tue, 22 Oct 2013 14:24:02 +0000 (09:24 -0500)
committerRobert Yang <liezhi.yang@windriver.com>
Wed, 11 Dec 2013 02:12:19 +0000 (21:12 -0500)
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 master rev: e10ae516cfc10900ed12e84c743e3a7127372135)

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>
scripts/lib/mic/imager/livecd.py

index 07115526bd853399f6bf3556f6ec0969ec88299d..e36f4a76c6120c05845bbbf3dedf504c81aebc1a 100644 (file)
@@ -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"):