!347 sync from master

From: @yang-chaohao 
Reviewed-by: @zhuchunyi 
Signed-off-by: @zhuchunyi

normal_aarch64.xml

@@ -621,6 +621,7 @@
     <packagelist>
     </packagelist>
   </group>
+
   <group>
     <id>guest-desktop-agents</id>
     <name>Guest Desktop Agents</name>
@@ -1313,8 +1314,6 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">libvirt</packagereq>
-      <packagereq type="mandatory">libvirt-admin</packagereq>
-      <packagereq type="mandatory">libvirt-bash-completion</packagereq>
       <packagereq type="mandatory">libvirt-client</packagereq>
       <packagereq type="mandatory">libvirt-daemon</packagereq>
       <packagereq type="mandatory">libvirt-daemon-config-network</packagereq>
@@ -1336,11 +1335,11 @@
       <packagereq type="mandatory">libvirt-daemon-driver-storage-rbd</packagereq>
       <packagereq type="mandatory">libvirt-daemon-driver-storage-scsi</packagereq>
       <packagereq type="mandatory">libvirt-daemon-kvm</packagereq>
+      <packagereq type="mandatory">libvirt-daemon-plugin-sanlock</packagereq>
       <packagereq type="mandatory">libvirt-daemon-qemu</packagereq>
       <packagereq type="mandatory">libvirt-devel</packagereq>
       <packagereq type="mandatory">libvirt-docs</packagereq>
       <packagereq type="mandatory">libvirt-libs</packagereq>
-      <packagereq type="mandatory">libvirt-lock-sanlock</packagereq>
       <packagereq type="mandatory">libvirt-nss</packagereq>
       <packagereq type="mandatory">python3-libvirt</packagereq>
       <packagereq type="mandatory">edk2-aarch64</packagereq>
@@ -1404,7 +1403,6 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">glx-utils</packagereq>
-      <packagereq type="mandatory">initial-setup-gui</packagereq>
       <packagereq type="mandatory">mesa-dri-drivers</packagereq>
       <packagereq type="mandatory">plymouth-system-theme</packagereq>
       <packagereq type="mandatory">spice-vdagent</packagereq>

normal_x86_64.xml

@@ -1317,8 +1317,6 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">libvirt</packagereq>
-      <packagereq type="mandatory">libvirt-admin</packagereq>
-      <packagereq type="mandatory">libvirt-bash-completion</packagereq>
       <packagereq type="mandatory">libvirt-client</packagereq>
       <packagereq type="mandatory">libvirt-daemon</packagereq>
       <packagereq type="mandatory">libvirt-daemon-config-network</packagereq>
@@ -1340,11 +1338,11 @@
       <packagereq type="mandatory">libvirt-daemon-driver-storage-rbd</packagereq>
       <packagereq type="mandatory">libvirt-daemon-driver-storage-scsi</packagereq>
       <packagereq type="mandatory">libvirt-daemon-kvm</packagereq>
+      <packagereq type="mandatory">libvirt-daemon-plugin-sanlock</packagereq>
       <packagereq type="mandatory">libvirt-daemon-qemu</packagereq>
       <packagereq type="mandatory">libvirt-devel</packagereq>
       <packagereq type="mandatory">libvirt-docs</packagereq>
       <packagereq type="mandatory">libvirt-libs</packagereq>
-      <packagereq type="mandatory">libvirt-lock-sanlock</packagereq>
       <packagereq type="mandatory">libvirt-nss</packagereq>
       <packagereq type="mandatory">python3-libvirt</packagereq>
       <packagereq type="mandatory">qemu-help</packagereq>
@@ -1406,7 +1404,6 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">glx-utils</packagereq>
-      <packagereq type="mandatory">initial-setup-gui</packagereq>
       <packagereq type="mandatory">mesa-dri-drivers</packagereq>
       <packagereq type="mandatory">plymouth-system-theme</packagereq>
       <packagereq type="mandatory">spice-vdagent</packagereq>

oemaker.spec

@@ -10,8 +10,8 @@ Name:           oemaker
 Summary:        a building tool for DVD ISO making and ISO cutting
 License:        Mulan PSL v2
 Group:          System/Management
-Version:        3.1.0
+Version:        3.2.0
-Release:        6
+Release:        2
 BuildRoot:      %{_tmppath}/%{name}
 
 Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -22,6 +22,8 @@ Source4:        edge_normal_aarch64.xml
 Source5:        edge_normal_x86_64.xml
 Source6:        desktop_normal_aarch64.xml
 Source7:        desktop_normal_x86_64.xml
+Source8:        rpmlist_riscv64.xml
+Source9:        normal_riscv64.xml
 
 Requires:       createrepo dnf-plugins-core genisoimage isomd5sum grep bash libselinux-utils libxml2 anaconda libselinux-utils
 Requires:       lorax >= 19.6.78-1
@@ -66,6 +68,13 @@ rm -rf  %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/desktop_n
 cp %{SOURCE7} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/desktop_normal.xml
 cd %{_builddir}/%{name}-%{version}/%{name}
 %autopatch -p1
+%ifarch riscv64
+rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/rpmlist.xml
+cp %{SOURCE8} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/rpmlist.xml
+rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/riscv64/normal.xml
+cp %{SOURCE9} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/riscv64/normal.xml
+%endif
+
 
 %install
 sys_arch=$(uname -m)
@@ -101,9 +110,13 @@ install -m 400 %{name}/isomaker/config/${sys_arch}/standard.conf %{buildroot}/op
 %ifarch x86_64
 install -m 700 %{name}/isomaker/config/x86_64/livecd/live/x86.tmpl %{buildroot}/opt/oemaker/config/x86_64/livecd/live/x86.tmpl
 install -m 400 %{name}/isomaker/config/x86_64/ks.cfg %{buildroot}/opt/oemaker/config/x86_64/ks.cfg
-%else
+%endif
+%ifarch aarch64
 install -m 700 %{name}/isomaker/config/aarch64/livecd/live/aarch64.tmpl %{buildroot}/opt/oemaker/config/aarch64/livecd/live/aarch64.tmpl
 %endif
+%ifarch riscv64
+install -m 700 %{name}/isomaker/config/riscv64/livecd/live/riscv64.tmpl %{buildroot}/opt/oemaker/config/riscv64/livecd/live/riscv64.tmpl
+%endif
 install -m 700 %{name}/isomaker/config/common/livecd/live/* %{buildroot}/opt/oemaker/config/common/livecd/live/
 install -m 400 %{name}/isomaker/config/common/livecd/root_pwd %{buildroot}/opt/oemaker/config/common/livecd/root_pwd
 install -m 700 %{name}/isomaker/docs/* %{buildroot}/opt/oemaker/docs/
@@ -173,11 +186,29 @@ rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}
 
 %changelog
-* Wed Jul 10 2024 wangchong <wangchong56@huawei.com> - 3.1.0-6
+* Mon Sep 23 2024 Ouuleilei <wangliu@iscas.ac.cn> - 3.2.0-2
+- fix riscv64.tmpl file miss problem and add riscv64 rpmlist.xml normal.xml
+
+* Wed Sep 18 2024 xiangyuning <xiangyuning@huawei.com> - 3.2.0-1
+- ID:NA
+- SUG:NA
+- upgrade to 3.2.0
+
+* Wed Jul 10 2024 wangchong <wangchong56@huawei.com> - 3.1.0-8
 - ID:NA
 - SUG:NA
 - DESC: fix issue IABY7K
 
+* Thu Mar 28 2024 mayunlong <mayunlong6@huawei.com> - 3.1.0-7
+- ID:NA
+- SUG:NA
+- DESC: delete libvirt package
+
+* Wed Mar 20 2024 sunhai <sunhai10@huawei.com> - 3.1.0-6
+- ID:NA
+- SUG:NA
+- DESC: delete initial-setup-gui
+
 * Tue Mar 19 2024 sunhai <sunhai10@huawei.com> - 3.1.0-5
 - ID:NA
 - SUG:NA

rpmlist.xml

@@ -717,8 +717,6 @@
         <packagereq>libverto-glib</packagereq>
         <packagereq>libverto-libevent</packagereq>
         <packagereq>libvirt</packagereq>
-        <packagereq>libvirt-admin</packagereq>
-        <packagereq>libvirt-bash-completion</packagereq>
         <packagereq>libvirt-client</packagereq>
         <packagereq>libvirt-daemon</packagereq>
         <packagereq>libvirt-daemon-config-network</packagereq>
@@ -739,7 +737,7 @@
         <packagereq>libvirt-daemon-driver-storage-mpath</packagereq>
         <packagereq>libvirt-daemon-driver-storage-rbd</packagereq>
         <packagereq>libvirt-daemon-driver-storage-scsi</packagereq>
-        <packagereq>libvirt-daemon-kvm</packagereq>
+	<packagereq>libvirt-daemon-kvm</packagereq>
         <packagereq>libvirt-daemon-qemu</packagereq>
         <packagereq>libvirt-devel</packagereq>
         <packagereq>libvirt-docs</packagereq>