SLFO-pool/virt-manager
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main virt-manager revision 0aad7ef8497c672d0b5a250ee8f9c13c

Browse Source
This commit is contained in:
Adrian Schröter
2025-03-12 17:21:39 +01:00
parent 60abaa92cd
commit f85cbc8c6a
4 changed files with 65 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
virt-manager.changes
View File

@@ -1,3 +1,22 @@
-------------------------------------------------------------------
Thu Mar 6 15:34:37 MST 2025 - carnold@suse.com
- bsc#1239013 - Unable to install an SEV-SNP guest with virt-install
virtinst-dont-require-uefi-for-sev-snp.patch
-------------------------------------------------------------------
Fri Feb 28 04:14:21 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
- Remove unneeded Requires on python3-ipaddr.
-------------------------------------------------------------------
Tue Feb 11 11:09:33 MST 2025 - carnold@suse.com
- Spec file modifications for SLES16 and some cleanups
virt-manager.spec
- Add additional detection code for SLES 16 media (bsc#1236252)
virtinst-add-sle16-detection-support.patch
-------------------------------------------------------------------
Tue Jan 28 10:24:44 MST 2025 - carnold@suse.com

14
virt-manager.spec
View File

@@ -105,6 +105,7 @@ Patch284: virtinst-add-slem60-detection-support.patch
Patch285: virtinst-windows-server-detection.patch
Patch286: virtinst-drop-removeprefix-usage.patch
Patch287: virtinst-add-sle16-detection-support.patch
Patch288: virtinst-dont-require-uefi-for-sev-snp.patch
BuildArch: noarch
@@ -158,7 +159,6 @@ Group: System/Monitoring
Requires: libosinfo >= 0.2.10
Requires: mkisofs
Requires: python3-gobject
Requires: python3-ipaddr
Requires: python3-libvirt-python >= 0.7.0
Requires: python3-libxml2-python
Requires: python3-pycurl
@@ -212,15 +212,13 @@ machine).
%install
%meson_install
#python3 setup.py \
# --no-update-icon-cache \
# --no-compile-schemas install \
# --prefix=%{_prefix} \
# -O1 --root=%{buildroot}
# YaST is not used on SLES16
%if %{?suse_version} != 1600
mkdir -p %{buildroot}/%{_datadir}/YaST2/clients/
install -m644 %SOURCE1 %{buildroot}/%{_datadir}/YaST2/clients/virt-install.rb
mkdir -p %{buildroot}/%{_datadir}/applications/YaST2/
install -m644 %SOURCE2 %{buildroot}/%{_datadir}/applications/YaST2/virt-install.desktop
%endif
# Oddly, supportconfig doesn't execute plugins with '-' in the name, so use 'virt_manager'
mkdir -p %{buildroot}/usr/lib/supportconfig/plugins
install -m 755 %SOURCE3 %{buildroot}/usr/lib/supportconfig/plugins/virt_manager
@@ -321,7 +319,9 @@ fi
%{_datadir}/metainfo/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
%if %{?suse_version} != 1600
%{_datadir}/applications/YaST2/virt-install.desktop
%endif
%{_datadir}/glib-2.0/schemas/org.virt-manager.virt-manager.gschema.xml
%dir /usr/lib/supportconfig
%dir /usr/lib/supportconfig/plugins
@@ -346,10 +346,12 @@ fi
%{_bindir}/virt-xml
%{_datadir}/bash-completion/completions/virt-xml
%if %{?suse_version} != 1600
%dir %{_datadir}/YaST2
%dir %{_datadir}/YaST2/clients
%dir %{_datadir}/applications/YaST2
%{_datadir}/YaST2/clients/virt-install.rb
%endif
%endif
%changelog

23
virtinst-add-sle16-detection-support.patch
View File

@@ -1,5 +1,7 @@
--- virt-manager-5.0.0/virtinst/install/urldetect.py.orig 2025-01-17 13:13:11.582745934 -0700
+++ virt-manager-5.0.0/virtinst/install/urldetect.py 2025-01-17 13:15:08.122748711 -0700
Index: virt-manager-5.0.0/virtinst/install/urldetect.py
===================================================================
--- virt-manager-5.0.0.orig/virtinst/install/urldetect.py
+++ virt-manager-5.0.0/virtinst/install/urldetect.py
@@ -279,6 +279,10 @@ class _SUSEContent(object):
else:
if "SUSE SL Micro" in self.product_name:
@@ -11,3 +13,20 @@
else:
sle_version = self.product_name.strip().rsplit(' ')[4]
if len(self.product_name.strip().rsplit(' ')) > 5 and not " Micro " in self.product_name:
@@ -521,10 +525,16 @@ class _SuseDistro(_RHELDistro):
content_str = cache.acquire_file_content("content")
if content_str is None:
products_str = cache.acquire_file_content("media.1/products")
+ if not products_str:
+ # For SLES16 install iso (not agama)
+ products_str = cache.acquire_file_content("install/media.1/products")
if products_str:
products_str = products_str.replace('/', ' ,', 1)
products_str = "DISTRO " + products_str.replace('-', ' ')
media_str = cache.acquire_file_content("media.1/media")
+ if not media_str:
+ # For SLES16 install iso (not agama)
+ media_str = cache.acquire_file_content("install/media.1/media")
if media_str:
media_arch = "x86_64"
if 'aarch64' in media_str:

17
virtinst-dont-require-uefi-for-sev-snp.patch Normal file
View File

@@ -0,0 +1,17 @@
References: bsc#1239013
virt-install incorrectly assumes SEV-SNP guests require EFI firmware
via a pflash device. For SNP guests, the firmware must be provided
as a ROM device.
--- virt-manager-5.0.0/virtinst/domain/launch_security.py.orig 2025-03-06 10:02:31.600954861 -0700
+++ virt-manager-5.0.0/virtinst/domain/launch_security.py 2025-03-06 14:42:46.001355525 -0700
@@ -43,7 +43,7 @@ class DomainLaunchSecurity(XMLBuilder):
self.policy = "0x07"
def _set_defaults_sev_snp(self, guest):
- if not guest.os.is_q35() or not guest.is_uefi():
+ if not guest.os.is_q35():
raise RuntimeError(_("SEV-SNP launch security requires a Q35 UEFI machine"))
def set_defaults(self, guest):