Accepting request 293978 from home:Andreas_Schwab:Factory

- virtman-allow-creating-i686-vm.patch: Allow creating i686 VM on x86_64
  (bsc#919692)

OBS-URL: https://build.opensuse.org/request/show/293978
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=222
This commit is contained in:
Charles Arnold 2015-04-01 22:27:40 +00:00 committed by Git OBS Bridge
parent 183e292d72
commit 1306d6fc30
3 changed files with 26 additions and 1 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Feb 26 10:39:17 UTC 2015 - schwab@suse.de
- virtman-allow-creating-i686-vm.patch: Allow creating i686 VM on x86_64
(bsc#919692)
-------------------------------------------------------------------
Wed Feb 25 14:10:15 MST 2015 - carnold@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package virt-manager
#
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define with_guestfs 0
%define askpass_package "openssh-askpass"
%define qemu_user "qemu"
@ -83,6 +84,7 @@ Patch159: virtinst-refresh_before_fetch_pool.patch
Patch160: virtinst-ignore-error-403-on-directories.patch
Patch161: virt-manager-Gtk-30.patch
Patch162: activate-default-console.patch
Patch163: virtman-allow-creating-i686-vm.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -209,6 +211,7 @@ machine).
%patch160 -p1
%patch161 -p1
%patch162 -p1
%patch163 -p1
%build
%if %{qemu_user}

View File

@ -0,0 +1,16 @@
Index: virt-manager-1.1.0/virtManager/create.py
===================================================================
--- virt-manager-1.1.0.orig/virtManager/create.py
+++ virt-manager-1.1.0/virtManager/create.py
@@ -694,11 +694,6 @@ class vmmCreate(vmmGObjectUI):
for guest in self.conn.caps.guests:
if guest.os_type == self.capsguest.os_type:
archs.append(guest.arch)
-
- # Combine x86/i686 to avoid confusion
- if (self.conn.caps.host.cpu.arch == "x86_64" and
- "x86_64" in archs and "i686" in archs):
- archs.remove("i686")
archs.sort()
prios = ["x86_64", "i686", "armv7l", "ppc64", "s390x"]