From 7b589311a05ef8e8b3176011432612d445536489 Mon Sep 17 00:00:00 2001
From: zhangqiumiao <zhangqiumiao1@huawei.com>
Date: Tue, 12 Sep 2023 08:47:43 +0000
Subject: [PATCH] Support for splitting kernel to kernel-min, kernel-base and
 kernel-extras

Signed-off-by: Qiumiao Zhang <zhangqiumiao1@huawei.com>
---
 edge_normal_aarch64.xml | 16 +++++++++++++++-
 edge_normal_x86_64.xml  | 16 +++++++++++++++-
 normal_aarch64.xml      | 17 ++++++++++++++++-
 normal_x86_64.xml       | 17 ++++++++++++++++-
 oemaker.spec            |  7 ++++++-
 5 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/edge_normal_aarch64.xml b/edge_normal_aarch64.xml
index 248efc5..c32c0ea 100644
--- a/edge_normal_aarch64.xml
+++ b/edge_normal_aarch64.xml
@@ -13,7 +13,7 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">audit</packagereq>
-      <packagereq type="mandatory">kernel</packagereq>
+      <packagereq type="mandatory">kernel-min</packagereq>
       <packagereq type="mandatory">basesystem</packagereq>
       <packagereq type="mandatory">bash</packagereq>
       <packagereq type="mandatory">coreutils</packagereq>
@@ -101,6 +101,18 @@
       <packagereq type="optional">chrony</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>basic-drivers</id>
+    <name>Basic Drivers</name>
+    <name xml:lang="zh_CN">基本驱动程序</name>
+    <description>The common drivers such as RAID, HBA, network card, etc.</description>
+    <description xml:lang="zh_CN">RAID、HBA、网卡等常见驱动程序。</description>
+    <default>true</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">kernel-base</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>edge</id>
     <name>Edge</name>
@@ -136,6 +148,7 @@
       <groupid>core</groupid>
     </grouplist>
     <optionlist>
+      <groupid>basic-drivers</groupid>
       <groupid>standard</groupid>
     </optionlist>
   </environment>
@@ -151,6 +164,7 @@
       <groupid>edge</groupid>
     </grouplist>
     <optionlist>
+      <groupid>basic-drivers</groupid>
       <groupid>standard</groupid>
     </optionlist>
   </environment>
diff --git a/edge_normal_x86_64.xml b/edge_normal_x86_64.xml
index 9693f17..8502013 100644
--- a/edge_normal_x86_64.xml
+++ b/edge_normal_x86_64.xml
@@ -13,7 +13,7 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">audit</packagereq>
-      <packagereq type="mandatory">kernel</packagereq>
+      <packagereq type="mandatory">kernel-min</packagereq>
       <packagereq type="mandatory">basesystem</packagereq>
       <packagereq type="mandatory">bash</packagereq>
       <packagereq type="mandatory">coreutils</packagereq>
@@ -101,6 +101,18 @@
       <packagereq type="optional">chrony</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>basic-drivers</id>
+    <name>Basic Drivers</name>
+    <name xml:lang="zh_CN">基本驱动程序</name>
+    <description>The common drivers such as RAID, HBA, network card, etc.</description>
+    <description xml:lang="zh_CN">RAID、HBA、网卡等常见驱动程序。</description>
+    <default>true</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">kernel-base</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>edge</id>
     <name>Edge</name>
@@ -136,6 +148,7 @@
       <groupid>core</groupid>
     </grouplist>
     <optionlist>
+      <groupid>basic-drivers</groupid>
       <groupid>standard</groupid>
     </optionlist>
   </environment>
@@ -151,6 +164,7 @@
       <groupid>edge</groupid>
     </grouplist>
     <optionlist>
+      <groupid>basic-drivers</groupid>
       <groupid>standard</groupid>
     </optionlist>
   </environment>
diff --git a/normal_aarch64.xml b/normal_aarch64.xml
index 9397e42..51ae528 100644
--- a/normal_aarch64.xml
+++ b/normal_aarch64.xml
@@ -244,7 +244,7 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">audit</packagereq>
-      <packagereq type="mandatory">kernel</packagereq>
+      <packagereq type="mandatory">kernel-min</packagereq>
       <packagereq type="mandatory">basesystem</packagereq>
       <packagereq type="mandatory">bash</packagereq>
       <packagereq type="mandatory">coreutils</packagereq>
@@ -1239,6 +1239,18 @@
       <packagereq type="default">cifs-utils</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>basic-drivers</id>
+    <name>Basic Drivers</name>
+    <name xml:lang="zh_CN">基本驱动程序</name>
+    <description>The common drivers such as RAID, HBA, network card, etc.</description>
+    <description xml:lang="zh_CN">RAID、HBA、网卡等常见驱动程序。</description>
+    <default>true</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">kernel-base</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>standard</id>
     <name>Standard</name>
@@ -1588,6 +1600,7 @@
       <groupid>core</groupid>
     </grouplist>
     <optionlist>
+      <groupid>basic-drivers</groupid>
       <groupid>standard</groupid>
     </optionlist>
   </environment>
@@ -1607,6 +1620,7 @@
       <groupid>standard</groupid>
     </grouplist>
     <optionlist>
+      <groupid>basic-drivers</groupid>
       <groupid>debugging</groupid>
       <groupid>dns-server</groupid>
       <groupid>file-server</groupid>
@@ -1637,6 +1651,7 @@
       <groupid>virtualization-hypervisor</groupid>
     </grouplist>
     <optionlist>
+      <groupid>basic-drivers</groupid>
       <groupid>debugging</groupid>
       <groupid>network-file-system-client</groupid>
       <groupid>remote-system-management</groupid>
diff --git a/normal_x86_64.xml b/normal_x86_64.xml
index 756c7a9..346e503 100644
--- a/normal_x86_64.xml
+++ b/normal_x86_64.xml
@@ -244,7 +244,7 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">audit</packagereq>
-      <packagereq type="mandatory">kernel</packagereq>
+      <packagereq type="mandatory">kernel-min</packagereq>
       <packagereq type="mandatory">basesystem</packagereq>
       <packagereq type="mandatory">bash</packagereq>
       <packagereq type="mandatory">coreutils</packagereq>
@@ -1241,6 +1241,18 @@
       <packagereq type="default">cifs-utils</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>basic-drivers</id>
+    <name>Basic Drivers</name>
+    <name xml:lang="zh_CN">基本驱动程序</name>
+    <description>The common drivers such as RAID, HBA, network card, etc.</description>
+    <description xml:lang="zh_CN">RAID、HBA、网卡等常见驱动程序。</description>
+    <default>true</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">kernel-base</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>standard</id>
     <name>Standard</name>
@@ -1590,6 +1602,7 @@
       <groupid>core</groupid>
     </grouplist>
     <optionlist>
+      <groupid>basic-drivers</groupid>
       <groupid>standard</groupid>
     </optionlist>
   </environment>
@@ -1609,6 +1622,7 @@
       <groupid>standard</groupid>
     </grouplist>
     <optionlist>
+      <groupid>basic-drivers</groupid>
       <groupid>debugging</groupid>
       <groupid>dns-server</groupid>
       <groupid>file-server</groupid>
@@ -1639,6 +1653,7 @@
       <groupid>virtualization-hypervisor</groupid>
     </grouplist>
     <optionlist>
+      <groupid>basic-drivers</groupid>
       <groupid>debugging</groupid>
       <groupid>network-file-system-client</groupid>
       <groupid>remote-system-management</groupid>
diff --git a/oemaker.spec b/oemaker.spec
index 66fb4e4..8857348 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.0.2
-Release:        8
+Release:        9
 BuildRoot:      %{_tmppath}/%{name}
 
 Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -164,6 +164,11 @@ rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}
 
 %changelog
+* Tue Sep 12 2023 zhangqiumiao <zhangqiumiao1@huawei.com> - 3.0.2-9
+- ID:NA
+- SUG:NA
+- DESC: Support for splitting kernel to kernel-min, kernel-base and kernel-extras
+
 * Mon Sep 4 2023 luhuaxin <luhuaxin1@huawei.com> - 3.0.2-8
 - ID:NA
 - SUG:NA
-- 
Gitee