packages/oemaker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!21 delete stratovirt from xml file

Browse Source 
From: @miao_kaibo
Reviewed-by: @zhuchunyi
Signed-off-by: @zhuchunyi
This commit is contained in:
openeuler-ci-bot 2021-03-12 14:00:05 +08:00 committed by Gitee
commit 1979fada86
2 changed files with 9 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
add-stratovirt-in-virtualization-group.patch
View File

@ -1,38 +0,0 @@
From 13b5d81210a6174bd71ce558777ce98981520170 Mon Sep 17 00:00:00 2001
From: Chen Qun <kuhn.chenqun@huawei.com>
Date: Mon, 1 Mar 2021 09:51:01 +0800
Subject: [PATCH] add stratovirt in virtualization group
Signed-off-by: Chen Qun <kuhn.chenqun@huawei.com>
---
config/aarch64/normal.xml | 1 +
config/x86_64/normal.xml | 1 +
2 files changed, 2 insertions(+)
diff --git a/config/aarch64/normal.xml b/config/aarch64/normal.xml
index cab5406..3582974 100644
--- a/config/aarch64/normal.xml
+++ b/config/aarch64/normal.xml
@@ -1426,6 +1426,7 @@
<packagereq type="mandatory">qemu-help</packagereq>
<packagereq type="mandatory">qemu</packagereq>
<packagereq type="mandatory">qemu-img</packagereq>
+ <packagereq type="mandatory">stratovirt</packagereq>
</packagelist>
</group>
<group>
diff --git a/config/x86_64/normal.xml b/config/x86_64/normal.xml
index 4ef88de..60c4704 100644
--- a/config/x86_64/normal.xml
+++ b/config/x86_64/normal.xml
@@ -1428,6 +1428,7 @@
<packagereq type="mandatory">qemu-help</packagereq>
<packagereq type="mandatory">qemu</packagereq>
<packagereq type="mandatory">qemu-img</packagereq>
+ <packagereq type="mandatory">stratovirt</packagereq>
</packagelist>
</group>
<group>
--
2.25.1

14
oemaker.spec
View File

@ -3,15 +3,14 @@ Summary: a duilding tool for making DVD ISO
License: Mulan PSL v2 License: Mulan PSL v2
Group: System/Management Group: System/Management
Version: 1.1.2 Version: 1.1.2
Release: 3 Release: 4
BuildRoot: %{_tmppath}/%{name} BuildRoot: %{_tmppath}/%{name}
Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
BuildArch: noarch BuildArch: noarch
Requires: createrepo dnf-plugins-core genisoimage isomd5sum grep bash libselinux-utils libxml2 Requires: createrepo dnf-plugins-core genisoimage isomd5sum grep bash libselinux-utils libxml2
Requires: lorax >= 19.6.78-1 Requires: lorax >= 19.6.78-1
Patch0001: add-stratovirt-in-virtualization-group.patch Patch0001: 0001-change-source-iso-method.patch
Patch0002: 0001-change-source-iso-method.patch
%description %description
a building tool for making DVD ISO a building tool for making DVD ISO
@ -67,12 +66,17 @@ rm -rf %{buildroot}
rm -rf $RPM_BUILD_DIR/%{name} rm -rf $RPM_BUILD_DIR/%{name}
%changelog %changelog
* Mon MAR 08 2021 miao_kaibo <miaokaibo@outlook.com> - 1.1.2-3 * Thu Mar 11 2021 miao_kaibo <miaokaibo@outlook.com> - 1.1.2-4
- ID:NA
- SUG:NA
- DESC: delete stratovirt from xml file
* Mon Mar 08 2021 miao_kaibo <miaokaibo@outlook.com> - 1.1.2-3
- ID:NA - ID:NA
- SUG:NA - SUG:NA
- DESC: change method of creating source iso - DESC: change method of creating source iso
* Thu MAR 01 2021 Chen Qun <kuhn.chenqun@huawei.com> - 1.1.2-2 * Thu Mar 01 2021 Chen Qun <kuhn.chenqun@huawei.com> - 1.1.2-2
- ID:NA - ID:NA
- SUG:NA - SUG:NA
- DESC: add stratovirt in virtualization-hypervisor group - DESC: add stratovirt in virtualization-hypervisor group