diff options
| author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2013-10-22 09:24:02 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-12 17:00:00 +0000 |
| commit | 45bdd32eebcc31432c29576357e95f787f873815 (patch) | |
| tree | 936ddab317ad4d009860c6e83db7b58900cd8150 /scripts/lib | |
| parent | 72db8ccf907c0d58707c9babdf008c3a61532a36 (diff) | |
| download | poky-45bdd32eebcc31432c29576357e95f787f873815.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 master rev: e10ae516cfc10900ed12e84c743e3a7127372135)
(From OE-Core rev: a3cc57cf3116c997ec11dd3cbfa3b0d615e5dabc)
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/lib')
| -rw-r--r-- | 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 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 | ||
| 744 | arch = rpmmisc.getBaseArch() | 744 | arch = "i386" |
| 745 | if arch in ("i386", "x86_64"): | 745 | if arch in ("i386", "x86_64"): |
| 746 | LiveCDImageCreator = x86LiveImageCreator | 746 | LiveCDImageCreator = x86LiveImageCreator |
| 747 | elif arch.startswith("arm"): | 747 | elif arch.startswith("arm"): |