Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at 2020-12-01 14:22:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virt-manager (Old) and /work/SRC/openSUSE:Factory/.virt-manager.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-manager" Tue Dec 1 14:22:55 2020 rev:216 rq:851950 version:3.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes 2020-11-17 21:26:11.233431480 +0100 +++ /work/SRC/openSUSE:Factory/.virt-manager.new.5913/virt-manager.changes 2020-12-01 14:23:09.773617742 +0100 @@ -1,0 +2,23 @@ +Mon Nov 30 13:39:10 MST 2020 - carn...@suse.com + +- bsc#1179236 - L3: virt-install: "Error validating install + location: invalid literal for int() with base 10" reported by + virt-install ref:_00D1igLOd._5001iTe00n:ref + virtinst-sap-detection.patch + +------------------------------------------------------------------- +Wed Nov 25 19:00:46 UTC 2020 - Bruce Rogers <brog...@suse.com> + +- boo#1178141 - Accomodate qemu modularization with respect to v5.2 + qemu changes, where 3 additional modular shared objects need to + be present for spice support. This change simply augments what + was done before, adding the additional code to the same patch + +------------------------------------------------------------------- +Fri Nov 20 13:52:33 MST 2020 - carn...@suse.com + +- bsc#1172340 - Several YaST modules can be started by typing + "yast2 $module <tab><tab>" + virt-install.rb + +------------------------------------------------------------------- New: ---- virtinst-sap-detection.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.KxQ9dq/_old 2020-12-01 14:23:10.865618922 +0100 +++ /var/tmp/diff_new_pack.KxQ9dq/_new 2020-12-01 14:23:10.869618927 +0100 @@ -72,6 +72,7 @@ Patch175: virtinst-keep-install-iso-attached.patch Patch176: virtinst-dont-use-special-copy-cpu-features.patch Patch177: virtinst-set-default-nic.patch +Patch178: virtinst-sap-detection.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -196,6 +197,7 @@ %patch175 -p1 %patch176 -p1 %patch177 -p1 +%patch178 -p1 %build %if %{default_hvs} ++++++ virt-install.rb ++++++ --- /var/tmp/diff_new_pack.KxQ9dq/_old 2020-12-01 14:23:11.009619079 +0100 +++ /var/tmp/diff_new_pack.KxQ9dq/_new 2020-12-01 14:23:11.013619083 +0100 @@ -43,6 +43,11 @@ @details = {} Builtins.y2milestone("START HERE.") + if WFM.Args == ["help"] + # Ignore yast help request + return :next + end + if UI.TextMode() Builtins.y2milestone("Running virt-install in text mode is not supported. Running vm-install instead in command line mode.") status = UI.RunInTerminal("/usr/bin/vm-install") ++++++ virtinst-graphics-add-check-for-qemu-modules-in-spice-graphic.patch ++++++ --- /var/tmp/diff_new_pack.KxQ9dq/_old 2020-12-01 14:23:11.077619152 +0100 +++ /var/tmp/diff_new_pack.KxQ9dq/_new 2020-12-01 14:23:11.081619156 +0100 @@ -1,6 +1,6 @@ -From 2919f40ac931dce5dedf326f84e83e8c04e1fabe Mon Sep 17 00:00:00 2001 +From dc5e834199e19ad09de17ac13e9834d3f17bd112 Mon Sep 17 00:00:00 2001 From: Bruce Rogers <brog...@suse.com> -Date: Sat, 24 Oct 2020 08:10:29 -0600 +Date: Wed, 25 Nov 2020 10:34:56 -0700 Subject: [PATCH] graphics: add check for qemu modules in spice graphics detection @@ -13,30 +13,43 @@ our own detection of whether the qemu modules needed to support the default guest install using spice, usb redirection, and qxl video are present. +With v5.2, some additional qemu modules are also required, so we add +a separate detection for that version, and add corresponding additional +module checks. Signed-off-by: Bruce Rogers <brog...@suse.com> --- - virtinst/devices/graphics.py | 9 +++++++++ - virtinst/support.py | 1 + - 2 files changed, 10 insertions(+) + virtinst/devices/graphics.py | 19 +++++++++++++++++++ + virtinst/support.py | 2 ++ + 2 files changed, 21 insertions(+) Index: virt-manager-3.1.0/virtinst/devices/graphics.py =================================================================== --- virt-manager-3.1.0.orig/virtinst/devices/graphics.py +++ virt-manager-3.1.0/virtinst/devices/graphics.py -@@ -135,6 +135,15 @@ class DeviceGraphics(Device): +@@ -135,6 +135,25 @@ class DeviceGraphics(Device): # Spice has issues on some host arches, like ppc, so allow it if self.conn.caps.host.cpu.arch not in ["i686", "x86_64"]: return False -+ if self.conn.support.conn_spice_modular(): ++ if self.conn.support.conn_spice_modular1(): + if self.conn.caps.host.cpu.arch in ["x86_64"]: + if not (os.path.exists("/usr/lib64/qemu/hw-usb-redirect.so") and + os.path.exists("/usr/lib64/qemu/hw-display-qxl.so")): + return False ++ if self.conn.support.conn_spice_modular2(): ++ if not (os.path.exists("/usr/lib64/qemu/chardev-spice.so") and ++ os.path.exists("/usr/lib64/qemu/ui-spice-core.so") and ++ os.path.exists("/usr/lib64/qemu/ui-opengl.so")): ++ return False + else: + if not (os.path.exists("/usr/lib/qemu/hw-usb-redirect.so") and + os.path.exists("/usr/lib/qemu/hw-display-qxl.so")): + return False ++ if self.conn.support.conn_spice_modular2(): ++ if not (os.path.exists("/usr/lib/qemu/chardev-spice.so") and ++ os.path.exists("/usr/lib/qemu/ui-spice-core.so") and ++ os.path.exists("/usr/lib/qemu/ui-opengl.so")): ++ return False return True def _listen_need_port(self): @@ -44,11 +57,12 @@ =================================================================== --- virt-manager-3.1.0.orig/virtinst/support.py +++ virt-manager-3.1.0/virtinst/support.py -@@ -282,6 +282,7 @@ class SupportCache: +@@ -282,6 +282,8 @@ class SupportCache: conn_disk_driver_name_qemu = _make( hv_version={"qemu": 0, "xen": "4.2.0"}, hv_libvirt_version={"qemu": 0, "xen": "1.1.0"}) -+ conn_spice_modular = _make(hv_version={"qemu": "5.1.0", "test": 0}) ++ conn_spice_modular1 = _make(hv_version={"qemu": "5.1.0", "test": 0}) ++ conn_spice_modular2 = _make(hv_version={"qemu": "5.2.0", "test": 0}) # Domain checks domain_xml_inactive = _make(function="virDomain.XMLDesc", run_args=(), ++++++ virtinst-sap-detection.patch ++++++ Index: virt-manager-3.2.0/virtinst/install/urldetect.py =================================================================== --- virt-manager-3.2.0.orig/virtinst/install/urldetect.py +++ virt-manager-3.2.0/virtinst/install/urldetect.py @@ -271,9 +271,16 @@ class _SUSEContent(object): distro_version = distro_version.strip() if "Enterprise" in self.product_name or "SLES" in self.product_name: - sle_version = self.product_name.strip().rsplit(' ')[4] + if " SAP " in self.product_name: + sle_version = self.product_name.strip().rsplit(' ')[7] + else: + sle_version = self.product_name.strip().rsplit(' ')[4] if len(self.product_name.strip().rsplit(' ')) > 5: - sle_version = (sle_version + '.' + + if " SAP " in self.product_name: + sle_version = (sle_version + '.' + + self.product_name.strip().rsplit(' ')[8][2]) + else: + sle_version = (sle_version + '.' + self.product_name.strip().rsplit(' ')[5][2]) distro_version = sle_version _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org