From eda444b84622853ea1cee356570bea49bc28fe7d Mon Sep 17 00:00:00 2001
From: zhoukaiqi <zhoukaiqi@huawei.com>
Date: Fri, 14 Jun 2024 12:37:47 +0000
Subject: [PATCH] add oeAware-manager, oeAware-collector, oeAware-scenario and
 oeAware-tune packages

---
 normal_aarch64.xml | 1 +
 normal_x86_64.xml  | 1 +
 oemaker.spec       | 7 ++++++-
 rpmlist.xml        | 4 ++++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/normal_aarch64.xml b/normal_aarch64.xml
index 308b03e..39cff40 100644
--- a/normal_aarch64.xml
+++ b/normal_aarch64.xml
@@ -308,6 +308,7 @@
       <packagereq type="optional">dracut-network</packagereq>
       <packagereq type="optional">rdma-core</packagereq>
       <packagereq type="optional">selinux-policy-mls</packagereq>
+      <packagereq type="default">oeAware-manager</packagereq>
     </packagelist>
   </group>
   <group>
diff --git a/normal_x86_64.xml b/normal_x86_64.xml
index a70d00f..edc768b 100644
--- a/normal_x86_64.xml
+++ b/normal_x86_64.xml
@@ -308,6 +308,7 @@
       <packagereq type="optional">dracut-network</packagereq>
       <packagereq type="optional">rdma-core</packagereq>
       <packagereq type="optional">selinux-policy-mls</packagereq>
+      <packagereq type="default">oeAware-manager</packagereq>
     </packagelist>
   </group>
   <group>
diff --git a/oemaker.spec b/oemaker.spec
index 6079b48..09d4ee1 100644
--- a/oemaker.spec
+++ b/oemaker.spec
@@ -11,7 +11,7 @@ Summary:        a building tool for DVD ISO making and ISO cutting
 License:        Mulan PSL v2
 Group:          System/Management
 Version:        3.1.0
-Release:        6
+Release:        7
 BuildRoot:      %{_tmppath}/%{name}
 
 Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -172,6 +172,11 @@ rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}
 
 %changelog
+* Fri Jun 14 2024 zhoukaiqi <zhoukaiqi@huawei.com> - 3.1.0-7
+- ID:NA
+- SUG:NA
+- DESC: add oeAware-manager, oeAware-collector, oeAware-scenario and oeAware-tune packages
+
 * Thu Jun 13 2024 zhongjiawei <zhongjiawei1@huawei.com> - 3.1.0-6
 - ID:NA
 - SUG:NA
diff --git a/rpmlist.xml b/rpmlist.xml
index 223ca88..f3179a7 100644
--- a/rpmlist.xml
+++ b/rpmlist.xml
@@ -1389,6 +1389,10 @@
         <packagereq>jemalloc-devel</packagereq>
         <packagereq>DCF</packagereq>
         <packagereq>opengauss</packagereq>
+        <packagereq>oeAware-collector</packagereq>
+        <packagereq>oeAware-scenario</packagereq>
+        <packagereq>oeAware-tune</packagereq>
+        <packagereq>oeAware-manager</packagereq>
     </packagelist>
     <packagelist type="edge_aarch64">
         <packagereq>grub2-efi-aa64</packagereq>
-- 
Gitee