- bsc#976796 - Virt-manager does not show up in application menu
virtman-desktop.patch virt-install.desktop - bsc#1010060 - virt-install won't start CASP installation virtinst-add-casp-support.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=336
This commit is contained in:
Charles Arnold
Git OBS Bridge
parent
c843b82f37
commit
5c9700fd6e
@ -2,7 +2,7 @@
|
||||
X-SuSE-translate=true
|
||||
X-SuSE-DocTeamID=ycc_xen
|
||||
Type=Application
|
||||
Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization;
|
||||
Categories=GTK;GNOME;System;Monitor;X-SuSE-YaST;X-SuSE-YaST-Virtualization;
|
||||
|
||||
X-KDE-ModuleType=Library
|
||||
X-KDE-RootOnly=true
|
||||
|
||||
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 18 10:54:58 MST 2017 - carnold@suse.com
|
||||
|
||||
- bsc#976796 - Virt-manager does not show up in application menu
|
||||
virtman-desktop.patch
|
||||
virt-install.desktop
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 13 11:38:11 MST 2017 - carnold@suse.com
|
||||
|
||||
- bsc#1010060 - virt-install won't start CASP installation
|
||||
virtinst-add-casp-support.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 6 15:54:59 MST 2017 - carnold@suse.com
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
%define qemu_user "qemu"
|
||||
%define libvirt_kvm_packages ""
|
||||
%define libvirt_xen_packages ""
|
||||
%define preferred_distros "sles12sp2,opensuse42.2"
|
||||
%define preferred_distros "sles12sp3,opensuse42.3"
|
||||
%define kvm_packages ""
|
||||
%define _version 1.4.0
|
||||
%define _release 0
|
||||
@ -75,6 +75,7 @@ Patch126: virtinst-add-default-rng-device.patch
|
||||
Patch127: virtinst-set-qemu-emulator.patch
|
||||
Patch128: virtinst-add-ppc64-arch-support.patch
|
||||
Patch129: virtinst-s390x-disable-graphics.patch
|
||||
Patch130: virtinst-add-casp-support.patch
|
||||
# Bug Fixes
|
||||
Patch150: virtman-prevent-double-click-starting-vm-twice.patch
|
||||
Patch151: virtman-increase-setKeepAlive-count.patch
|
||||
@ -205,6 +206,7 @@ machine).
|
||||
%patch127 -p1
|
||||
%patch128 -p1
|
||||
%patch129 -p1
|
||||
%patch130 -p1
|
||||
# Bug Fixes
|
||||
%patch150 -p1
|
||||
%patch151 -p1
|
||||
|
||||
48
virtinst-add-casp-support.patch
Normal file
48
virtinst-add-casp-support.patch
Normal file
@ -0,0 +1,48 @@
|
||||
References: bsc#1010060
|
||||
Notes: SUSE Containers as a Service Platform and 'CASP' are not
|
||||
names set in stone yet and could change before the product ships.
|
||||
|
||||
Index: virt-manager-1.4.0/virtinst/urlfetcher.py
|
||||
===================================================================
|
||||
--- virt-manager-1.4.0.orig/virtinst/urlfetcher.py
|
||||
+++ virt-manager-1.4.0/virtinst/urlfetcher.py
|
||||
@@ -464,6 +464,10 @@ def _distroFromSUSEContent(fetcher, arch
|
||||
dclass = SLESDistro
|
||||
if distro_version is None:
|
||||
distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]]
|
||||
+ elif re.match(".*SUSE Containers as a Service Platform*", distribution[1]):
|
||||
+ dclass = CASPDistro
|
||||
+ if distro_version is None:
|
||||
+ distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[6]]
|
||||
elif re.match(".*openSUSE.*", distribution[1]):
|
||||
dclass = OpensuseDistro
|
||||
if distro_version is None:
|
||||
@@ -1019,7 +1023,8 @@ class SuseDistro(Distro):
|
||||
distro_version = self.version_from_content[1].strip()
|
||||
version = distro_version.split('.', 1)[0].strip()
|
||||
self.os_variant = self.urldistro
|
||||
- if int(version) >= 10:
|
||||
+ version_int = int(version)
|
||||
+ if version_int >= 10:
|
||||
if self.os_variant.startswith(("sles", "sled")):
|
||||
sp_version = None
|
||||
if len(distro_version.split('.', 1)) == 2:
|
||||
@@ -1033,6 +1038,8 @@ class SuseDistro(Distro):
|
||||
self.os_variant += "tumbleweed"
|
||||
else:
|
||||
self.os_variant += distro_version
|
||||
+ elif version_int == 1 and self.os_variant.startswith("casp"):
|
||||
+ self.os_variant = "casp"
|
||||
else:
|
||||
self.os_variant += "9"
|
||||
|
||||
@@ -1079,6 +1086,9 @@ class SLESDistro(SuseDistro):
|
||||
class SLEDDistro(SuseDistro):
|
||||
urldistro = "sled"
|
||||
|
||||
+class CASPDistro(SuseDistro):
|
||||
+ urldistro = "casp"
|
||||
+
|
||||
|
||||
# Suse image store is harder - we fetch the kernel RPM and a helper
|
||||
# RPM and then munge bits together to generate a initrd
|
||||
@ -8,7 +8,7 @@ Index: virt-manager-1.4.0/virtinst/urlfetcher.py
|
||||
===================================================================
|
||||
--- virt-manager-1.4.0.orig/virtinst/urlfetcher.py
|
||||
+++ virt-manager-1.4.0/virtinst/urlfetcher.py
|
||||
@@ -1012,8 +1012,12 @@ class SuseDistro(Distro):
|
||||
@@ -1016,8 +1016,12 @@ class SuseDistro(Distro):
|
||||
"boot/%s/initrd" % self.arch))
|
||||
|
||||
# Matches Opensuse > 10.2 and sles 10
|
||||
|
||||
@ -16,7 +16,7 @@ Index: virt-manager-1.4.0/data/virt-manager.desktop.in
|
||||
Terminal=false
|
||||
-Categories=System;
|
||||
+Encoding=UTF-8
|
||||
+Categories=GTK;GNOME;System;Monitor;Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization;
|
||||
+Categories=GTK;GNOME;System;Monitor;X-SuSE-YaST;X-SuSE-YaST-Virtualization;
|
||||
+X-KDE-ModuleType=Library
|
||||
+X-KDE-RootOnly=true
|
||||
+X-KDE-HasReadOnlyMode=false
|
||||
|
||||
Loading…
Reference in New Issue
Block a user