From 2e4514bccf93f7dea5ba0f8d0bf370385a108cad Mon Sep 17 00:00:00 2001
From: zhu-yuncheng <zhuyuncheng@huawei.com>
Date: Wed, 23 Feb 2022 15:43:34 +0800
Subject: [PATCH] add Server install mode and pkgs for edge computing iso

---
 edge_normal_aarch64.xml | 39 +++++++++++++++++++++++++++++++++++++++
 edge_normal_x86_64.xml  | 39 +++++++++++++++++++++++++++++++++++++++
 oemaker.spec            |  7 ++++++-
 3 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/edge_normal_aarch64.xml b/edge_normal_aarch64.xml
index 8810540..8ce22fc 100644
--- a/edge_normal_aarch64.xml
+++ b/edge_normal_aarch64.xml
@@ -102,6 +102,30 @@
       <packagereq type="optional">chrony</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>edge</id>
+    <name>Edge</name>
+    <name xml:lang="zh_CN">边缘场景</name>
+    <description>Package for edge scene</description>
+    <description xml:lang="zh_CN">边缘场景相关包</description>
+    <default>true</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">kubernetes</packagereq>
+      <packagereq type="default">kubernetes-client</packagereq>
+      <packagereq type="default">kubernetes-help</packagereq>
+      <packagereq type="default">kubernetes-kubeadm</packagereq>
+      <packagereq type="default">kubernetes-kubelet</packagereq>
+      <packagereq type="default">kubernetes-master</packagereq>
+      <packagereq type="default">kubernetes-node</packagereq>
+      <packagereq type="default">kubeedge-cloudcore</packagereq>
+      <packagereq type="default">kubeedge-edgecore</packagereq>
+      <packagereq type="default">kubeedge-edgesite</packagereq>
+      <packagereq type="default">kubeedge-keadm</packagereq>
+      <packagereq type="default">mdadm</packagereq>
+      <packagereq type="default">mdadm-help</packagereq>
+    </packagelist>
+  </group>
   <environment>
     <id>minimal-environment</id>
     <name>Minimal Install</name>
@@ -116,4 +140,19 @@
       <groupid>standard</groupid>
     </optionlist>
   </environment>
+  <environment>
+    <id>edge-cloud-environment</id>
+    <name>Edge Cloud</name>
+    <name xml:lang="zh_CN">边缘云</name>
+    <description>For edge computing scenarios</description>
+    <description xml:lang="zh_CN">用于边缘计算场景</description>
+    <display_order>2</display_order>
+    <grouplist>
+      <groupid>core</groupid>
+      <groupid>edge</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid>standard</groupid>
+    </optionlist>
+  </environment>
 </comps>
diff --git a/edge_normal_x86_64.xml b/edge_normal_x86_64.xml
index a165920..a7e64e1 100644
--- a/edge_normal_x86_64.xml
+++ b/edge_normal_x86_64.xml
@@ -102,6 +102,30 @@
       <packagereq type="optional">chrony</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>edge</id>
+    <name>Edge</name>
+    <name xml:lang="zh_CN">边缘场景</name>
+    <description>Package for edge scene</description>
+    <description xml:lang="zh_CN">边缘场景相关包</description>
+    <default>true</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">kubernetes</packagereq>
+      <packagereq type="default">kubernetes-client</packagereq>
+      <packagereq type="default">kubernetes-help</packagereq>
+      <packagereq type="default">kubernetes-kubeadm</packagereq>
+      <packagereq type="default">kubernetes-kubelet</packagereq>
+      <packagereq type="default">kubernetes-master</packagereq>
+      <packagereq type="default">kubernetes-node</packagereq>
+      <packagereq type="default">kubeedge-cloudcore</packagereq>
+      <packagereq type="default">kubeedge-edgecore</packagereq>
+      <packagereq type="default">kubeedge-edgesite</packagereq>
+      <packagereq type="default">kubeedge-keadm</packagereq>
+      <packagereq type="default">mdadm</packagereq>
+      <packagereq type="default">mdadm-help</packagereq>
+    </packagelist>
+  </group>
   <environment>
     <id>minimal-environment</id>
     <name>Minimal Install</name>
@@ -116,4 +140,19 @@
       <groupid>standard</groupid>
     </optionlist>
   </environment>
+  <environment>
+    <id>edge-cloud-environment</id>
+    <name>Edge Cloud</name>
+    <name xml:lang="zh_CN">边缘云</name>
+    <description>For edge computing scenarios</description>
+    <description xml:lang="zh_CN">用于边缘计算场景</description>
+    <display_order>2</display_order>
+    <grouplist>
+      <groupid>core</groupid>
+      <groupid>edge</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid>standard</groupid>
+    </optionlist>
+  </environment>
 </comps>
diff --git a/oemaker.spec b/oemaker.spec
index bfefc5e..eda1355 100644
--- a/oemaker.spec
+++ b/oemaker.spec
@@ -11,7 +11,7 @@ Summary:        a duilding tool for DVD ISO making and ISO cutting
 License:        Mulan PSL v2
 Group:          System/Management
 Version:        2.0.0
-Release:        18
+Release:        19
 BuildRoot:      %{_tmppath}/%{name}
 
 Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -130,6 +130,11 @@ rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}
 
 %changelog
+* Wed Feb 23 2022 zhuyuncheng <zhuyuncheng@huawei.com> - 2.0.0-19
+- ID:NA
+- SUG:NA
+- DESC: add Server install mode and packages for edge computing iso
+
 * Tue Feb 22 2022 jiangheng <jiangheng12@huawei.com> - 2.0.0-18
 - ID:NA
 - SUG:NA
-- 
Gitee