diff --git a/edge_normal_aarch64.xml b/edge_normal_aarch64.xml index 248efc5b599aedd0167d088602d044888949c152..670c99fadc0d9df277eeac849681eab83fe774dd 100644 --- a/edge_normal_aarch64.xml +++ b/edge_normal_aarch64.xml @@ -117,10 +117,10 @@ kubernetes-kubelet kubernetes-master kubernetes-node - kubeedge-cloudcore - kubeedge-edgecore - kubeedge-edgesite - kubeedge-keadm + k3s + k3s-selinux + k3s-plugins + k3s-containerd mdadm mdadm-help diff --git a/edge_normal_x86_64.xml b/edge_normal_x86_64.xml index 9693f176364b52c91bdd7a4220989e18e9bb3591..ab2243e958a9c269398370db16279046d028b831 100644 --- a/edge_normal_x86_64.xml +++ b/edge_normal_x86_64.xml @@ -117,10 +117,10 @@ kubernetes-kubelet kubernetes-master kubernetes-node - kubeedge-cloudcore - kubeedge-edgecore - kubeedge-edgesite - kubeedge-keadm + k3s + k3s-selinux + k3s-plugins + k3s-containerd mdadm mdadm-help diff --git a/oemaker.spec b/oemaker.spec index d6af05ad1785ae2caba3cc763de12394339b7e55..61ebcb5b8667815940e500f53a2cef788740bb2b 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 - 3.2.0-8 +- ID:NA +- SUG:NA +- DESC: edge_ISO change kubeedge to k3s + * Thu Dec 5 2024 zhaolichang - 3.2.0-7 - ID:NA - SUG:NA diff --git a/rpmlist.xml b/rpmlist.xml index 21c73ad4954788dc63f45703a604057ac026a2cd..d67d0838eaece20cc2732f8888afbdc4d6a02c0c 100644 --- a/rpmlist.xml +++ b/rpmlist.xml @@ -1400,10 +1400,10 @@ kubernetes-kubelet kubernetes-master kubernetes-node - kubeedge-cloudcore - kubeedge-edgecore - kubeedge-edgesite - kubeedge-keadm + k3s + k3s-selinux + k3s-plugins + k3s-containerd grub2-common grub2-tools-minimal grub2-tools-extra