From 0b168cc34ff4614fad727ed6cba14a24565180fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=B6=85=E8=B1=AA?= <yangchaohao@huawei.com>
Date: Fri, 6 Dec 2024 10:00:00 +0000
Subject: [PATCH] edge_ISO change kubeedge to k3s
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 杨超豪 <yangchaohao@huawei.com>
---
 edge_normal_aarch64.xml | 8 ++++----
 edge_normal_x86_64.xml  | 8 ++++----
 oemaker.spec            | 7 ++++++-
 rpmlist.xml             | 8 ++++----
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/edge_normal_aarch64.xml b/edge_normal_aarch64.xml
index 248efc5..670c99f 100644
--- a/edge_normal_aarch64.xml
+++ b/edge_normal_aarch64.xml
@@ -117,10 +117,10 @@
       <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">k3s</packagereq>
+      <packagereq type="default">k3s-selinux</packagereq>
+      <packagereq type="default">k3s-plugins</packagereq>
+      <packagereq type="default">k3s-containerd</packagereq>
       <packagereq type="default">mdadm</packagereq>
       <packagereq type="default">mdadm-help</packagereq>
     </packagelist>
diff --git a/edge_normal_x86_64.xml b/edge_normal_x86_64.xml
index 9693f17..ab2243e 100644
--- a/edge_normal_x86_64.xml
+++ b/edge_normal_x86_64.xml
@@ -117,10 +117,10 @@
       <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">k3s</packagereq>
+      <packagereq type="default">k3s-selinux</packagereq>
+      <packagereq type="default">k3s-plugins</packagereq>
+      <packagereq type="default">k3s-containerd</packagereq>
       <packagereq type="default">mdadm</packagereq>
       <packagereq type="default">mdadm-help</packagereq>
     </packagelist>
diff --git a/oemaker.spec b/oemaker.spec
index d6af05a..61ebcb5 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.2.0
-Release:        7
+Release:        8
 BuildRoot:      %{_tmppath}/%{name}
 
 Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -186,6 +186,11 @@ rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}
 
 %changelog
+* Fri Dec 6 2024 yangchaohao <yangchaohao@huawei.com> - 3.2.0-8
+- ID:NA
+- SUG:NA
+- DESC: edge_ISO change kubeedge to k3s
+
 * Thu Dec 5 2024 zhaolichang <zhaolichang@huawei.com> - 3.2.0-7
 - ID:NA
 - SUG:NA
diff --git a/rpmlist.xml b/rpmlist.xml
index 21c73ad..d67d083 100644
--- a/rpmlist.xml
+++ b/rpmlist.xml
@@ -1400,10 +1400,10 @@
         <packagereq>kubernetes-kubelet</packagereq>
         <packagereq>kubernetes-master</packagereq>
         <packagereq>kubernetes-node</packagereq>
-        <packagereq>kubeedge-cloudcore</packagereq>
-        <packagereq>kubeedge-edgecore</packagereq>
-        <packagereq>kubeedge-edgesite</packagereq>
-        <packagereq>kubeedge-keadm</packagereq>
+        <packagereq>k3s</packagereq>
+        <packagereq>k3s-selinux</packagereq>
+        <packagereq>k3s-plugins</packagereq>
+        <packagereq>k3s-containerd</packagereq>
         <packagereq>grub2-common</packagereq>
         <packagereq>grub2-tools-minimal</packagereq>
         <packagereq>grub2-tools-extra</packagereq>
-- 
Gitee