!14 [sync] PR-13: 添加sw架构

From: @openeuler-sync-bot 
Reviewed-by: @jxy_git 
Signed-off-by: @jxy_git
This commit is contained in:
openeuler-ci-bot 2022-10-26 06:00:33 +00:00 committed by Gitee
commit a82ac4877b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 44 additions and 1 deletions

View File

@ -0,0 +1,39 @@
From 04751a30760ae367d6b615ade7bbd658025d2f1d Mon Sep 17 00:00:00 2001
From: wzx <wuzx1226@qq.com>
Date: Wed, 26 Oct 2022 10:12:57 +0800
Subject: [PATCH] Add sw64 architecture
Signed-off-by: wzx <wuzx1226@qq.com>
---
virtManager/create.py | 1 +
virtinst/domain/os.py | 2 ++
2 files changed, 3 insertions(+)
diff --git a/virtManager/create.py b/virtManager/create.py
index ff3373d..e7ddd0c 100644
--- a/virtManager/create.py
+++ b/virtManager/create.py
@@ -427,6 +427,7 @@ class vmmCreate(vmmGObjectUI):
installable_arch = bool(guest.os.is_x86() or
guest.os.is_ppc64() or
+ guest.os.is_sw_64() or
guest.os.is_s390x())
if guest.prefers_uefi():
diff --git a/virtinst/domain/os.py b/virtinst/domain/os.py
index 32343ab..fdcaa19 100644
--- a/virtinst/domain/os.py
+++ b/virtinst/domain/os.py
@@ -46,6 +46,8 @@ class DomainOs(XMLBuilder):
return self.arch == "armv7l"
def is_arm64(self):
return self.arch == "aarch64"
+ def is_sw_64(self):
+ return self.arch == "sw_64"
def is_arm(self):
return self.is_arm32() or self.is_arm64()
def is_arm_vexpress(self):
--
2.33.0

View File

@ -1,7 +1,7 @@
%global __python %{__python3}
Name: virt-manager
Version: 2.1.0
Release: 5
Release: 6
Summary: The manage virtual machines tool which via libvirt.
License: GPLv2+
BuildArch: noarch
@ -9,6 +9,7 @@ URL: https://virt-manager.org/
Source0: https://virt-manager.org/download/sources/virt-manager/virt-manager-%{version}.tar.gz
Patch0001: 0001-initrdinject-Use-full-option-versions-for-cpio.patch
Patch0002: 0002-initrdinject-Force-added-files-to-be-owned-as-root-b.patch
Patch0003: 0003-virt-manager-Add-sw64-architecture.patch
Requires: virt-manager-common = %{version}-%{release} python3-gobject gtk3 libvirt-glib >= 0.0.9
Requires: gtk-vnc2 spice-gtk3 dconf vte291
Recommends: (libvirt-daemon-kvm or libvirt-daemon-qemu) libvirt-daemon-config-network
@ -81,6 +82,9 @@ done
%{_mandir}/man1/{virt-install.1*,virt-clone.1*,virt-convert.1*,virt-xml.1*}
%changelog
* Wed Oct 26 2022 wuzx<wuzx1226@qq.com> - 2.1.0-6
- Add sw64 architecture
* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 2.1.0-5
- DESC: delete -S git from %autosetup, and delete BuildRequires git