From 749d9646fee7a43edce6326f1ca96d7b0d6674c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=B6=85=E8=B1=AA?= <yangchaohao@huawei.com>
Date: Thu, 21 Aug 2025 02:25:43 +0000
Subject: [PATCH] delete packages that don't exist in the Edge image
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 | 4 ----
 edge_normal_x86_64.xml  | 4 ----
 oemaker.spec            | 7 ++++++-
 rpmlist.xml             | 4 ----
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/edge_normal_aarch64.xml b/edge_normal_aarch64.xml
index 9b15a41..670c99f 100644
--- a/edge_normal_aarch64.xml
+++ b/edge_normal_aarch64.xml
@@ -117,10 +117,6 @@
       <packagereq type="default">kubernetes-kubelet</packagereq>
       <packagereq type="default">kubernetes-master</packagereq>
       <packagereq type="default">kubernetes-node</packagereq>
-      <packagereq type="default">kubernetes-cloudcore</packagereq>
-      <packagereq type="default">kubernetes-edgecore</packagereq>
-      <packagereq type="default">kubernetes-edgesite</packagereq>
-      <packagereq type="default">kubernetes-keadm</packagereq>
       <packagereq type="default">k3s</packagereq>
       <packagereq type="default">k3s-selinux</packagereq>
       <packagereq type="default">k3s-plugins</packagereq>
diff --git a/edge_normal_x86_64.xml b/edge_normal_x86_64.xml
index f9a26ad..ab2243e 100644
--- a/edge_normal_x86_64.xml
+++ b/edge_normal_x86_64.xml
@@ -117,10 +117,6 @@
       <packagereq type="default">kubernetes-kubelet</packagereq>
       <packagereq type="default">kubernetes-master</packagereq>
       <packagereq type="default">kubernetes-node</packagereq>
-      <packagereq type="default">kubernetes-cloudcore</packagereq>
-      <packagereq type="default">kubernetes-edgecore</packagereq>
-      <packagereq type="default">kubernetes-edgesite</packagereq>
-      <packagereq type="default">kubernetes-keadm</packagereq>
       <packagereq type="default">k3s</packagereq>
       <packagereq type="default">k3s-selinux</packagereq>
       <packagereq type="default">k3s-plugins</packagereq>
diff --git a/oemaker.spec b/oemaker.spec
index 7887701..a020e8b 100644
--- a/oemaker.spec
+++ b/oemaker.spec
@@ -15,7 +15,7 @@ Summary:        a building tool for DVD ISO making and ISO cutting
 License:        Mulan PSL v2
 Group:          System/Management
 Version:        3.3.0
-Release:        14
+Release:        15
 BuildRoot:      %{_tmppath}/%{name}
 
 Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -235,6 +235,11 @@ rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}
 
 %changelog
+* Wed Aug 20 2025 yangchaohao <yangchaohao@huawei.com> - 3.3.0-15
+- ID:NA
+- SUG:NA
+- DESC: delete packages that don't exist in the Edge image
+
 * Wed Aug 13 2025 Wangmian <wangmian19@h-partners.com> - 3.3.0-14
 - ID:NA
 - SUG:NA
diff --git a/rpmlist.xml b/rpmlist.xml
index bb9579c..7640de3 100644
--- a/rpmlist.xml
+++ b/rpmlist.xml
@@ -1428,10 +1428,6 @@
         <packagereq>kubernetes-kubelet</packagereq>
         <packagereq>kubernetes-master</packagereq>
         <packagereq>kubernetes-node</packagereq>
-        <packagereq>kubernetes-cloudcore</packagereq>
-        <packagereq>kubernetes-edgecore</packagereq>
-        <packagereq>kubernetes-edgesite</packagereq>
-        <packagereq>kubernetes-keadm</packagereq>
         <packagereq type="default">k3s</packagereq>
         <packagereq type="default">k3s-selinux</packagereq>
         <packagereq type="default">k3s-plugins</packagereq>
-- 
Gitee