diff --git a/edge_normal_aarch64.xml b/edge_normal_aarch64.xml index 248efc5b599aedd0167d088602d044888949c152..9b15a4107f783080bbdd7265ca889d98d312e497 100644 --- a/edge_normal_aarch64.xml +++ b/edge_normal_aarch64.xml @@ -117,10 +117,14 @@ kubernetes-kubelet kubernetes-master kubernetes-node - kubeedge-cloudcore - kubeedge-edgecore - kubeedge-edgesite - kubeedge-keadm + kubernetes-cloudcore + kubernetes-edgecore + kubernetes-edgesite + kubernetes-keadm + k3s + k3s-selinux + k3s-plugins + k3s-containerd mdadm mdadm-help diff --git a/edge_normal_riscv64.xml b/edge_normal_riscv64.xml new file mode 100644 index 0000000000000000000000000000000000000000..ab2243e958a9c269398370db16279046d028b831 --- /dev/null +++ b/edge_normal_riscv64.xml @@ -0,0 +1,157 @@ + + + + + core + Core + 核心 + Smallest possible installation + 最小安装 + true + false + + audit + kernel + basesystem + bash + coreutils + cronie + curl + dnf + e2fsprogs + filesystem + firewalld + glibc + grubby + hostname + initscripts + iproute + iprutils + iputils + irqbalance + kbd + kexec-tools + less + man-db + ncurses + openssh + openssh-server + openssh-clients + openEuler-release + openEuler-latest-release + parted + passwd + policycoreutils + procps-ng + rng-tools + rootfiles + rpm + selinux-policy-targeted + setup + shadow + sssd + sudo + systemd + tuned + util-linux + vim-minimal + xfsprogs + yum + wget + NetworkManager + NetworkManager-config-server + authselect + dnf-plugins-core + dracut-config-rescue + kernel-tools + sysfsutils + linux-firmware + lshw + lsscsi + rsyslog + security-tool + sg3_utils + dracut-config-generic + dracut-network + rdma-core + selinux-policy-mls + patch + patch-help + ntp + ntp-help + ntp-perl + iSulad + tar + socat + socat-help + conntrack-tools + conntrack-tools-help + vim-X11 + vim-common + vim-enhanced + vim-filesystem + vim-minimal + efibootmgr + efibootmgr-help + cjson + cjson-devel + mosquitto + chrony + + + + edge + Edge + 边缘场景 + Package for edge scene + 边缘场景相关包 + true + false + + kubernetes + kubernetes-client + kubernetes-help + kubernetes-kubeadm + kubernetes-kubelet + kubernetes-master + kubernetes-node + k3s + k3s-selinux + k3s-plugins + k3s-containerd + mdadm + mdadm-help + + + + minimal-environment + Minimal Install + 最小安装 + Basic functionality. + 基本功能。 + 1 + + core + + + standard + + + + edge-cloud-environment + Edge Cloud + 边缘云 + For edge computing scenarios + 用于边缘计算场景 + 2 + + core + edge + + + standard + + + diff --git a/edge_normal_x86_64.xml b/edge_normal_x86_64.xml index 9693f176364b52c91bdd7a4220989e18e9bb3591..f9a26ad057b26e46026381c35db524c451a2d09f 100644 --- a/edge_normal_x86_64.xml +++ b/edge_normal_x86_64.xml @@ -117,10 +117,14 @@ kubernetes-kubelet kubernetes-master kubernetes-node - kubeedge-cloudcore - kubeedge-edgecore - kubeedge-edgesite - kubeedge-keadm + kubernetes-cloudcore + kubernetes-edgecore + kubernetes-edgesite + kubernetes-keadm + k3s + k3s-selinux + k3s-plugins + k3s-containerd mdadm mdadm-help diff --git a/normal_aarch64.xml b/normal_aarch64.xml index 3e2e5f3af0c628a8083e427202fb19419bae3971..6a80486d14f0bef39a5260b7f12280c63722852e 100644 --- a/normal_aarch64.xml +++ b/normal_aarch64.xml @@ -295,6 +295,7 @@ authselect dnf-plugins-core dracut-config-rescue + iptables-nft kernel-tools sysfsutils linux-firmware @@ -303,6 +304,7 @@ rsyslog security-tool sg3_utils + systemd-cryptsetup dracut-config-generic dracut-network rdma-core diff --git a/normal_loongarch64.xml b/normal_loongarch64.xml index aa316c4a4c0d7e5e301b645b20f4fa16db82a7ec..2f20ce6471d5c62b463c50156e48c68099a61867 100644 --- a/normal_loongarch64.xml +++ b/normal_loongarch64.xml @@ -1316,6 +1316,7 @@ spice-vdagent xorg-x11-drivers xorg-x11-server-Xorg + xorg-x11-utils xorg-x11-xauth xorg-x11-xinit xvattr diff --git a/normal_riscv64.xml b/normal_riscv64.xml index c49bf67cba25d2bc4d54059614732b3d9296b3e7..3d0c6076487a804ecf0fb974e7a857157ac5c106 100644 --- a/normal_riscv64.xml +++ b/normal_riscv64.xml @@ -294,6 +294,7 @@ authselect dnf-plugins-core dracut-config-rescue + iptables-nft kernel-tools sysfsutils linux-firmware @@ -302,6 +303,7 @@ rsyslog security-tool sg3_utils + systemd-cryptsetup dracut-config-generic dracut-network rdma-core @@ -473,6 +475,8 @@ java-1.8.0-openjdk-devel libedit-devel libaio-devel + DCF + opengauss @@ -670,6 +674,7 @@ PackageKit cockpit + cockpit openssh-server sscg @@ -1341,6 +1346,7 @@ qemu qemu-block-iscsi qemu-img + stratovirt @@ -1400,6 +1406,7 @@ spice-vdagent xorg-x11-drivers xorg-x11-server-Xorg + xorg-x11-utils xorg-x11-xauth xorg-x11-xinit xvattr diff --git a/normal_x86_64.xml b/normal_x86_64.xml index dc47070e78511275830fafda40842d7e6bdd8bc3..afd66e835a288dc6080ac18c307cd59d01f0cca4 100644 --- a/normal_x86_64.xml +++ b/normal_x86_64.xml @@ -295,6 +295,7 @@ authselect dnf-plugins-core dracut-config-rescue + iptables-nft kernel-tools sysfsutils linux-firmware @@ -303,6 +304,7 @@ rsyslog security-tool sg3_utils + systemd-cryptsetup dracut-config-generic dracut-network rdma-core diff --git a/oemaker.spec b/oemaker.spec index 01286a2ac8a4648608efe8f8351b326961eabce2..bbaf38927b3750040747c2765a813cc139cb0698 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: 6 +Release: 7 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -33,6 +33,7 @@ Source11: rpmlist_loongarch64.xml Source12: desktop_normal_loongarch64.xml Source13: devstation_aarch64_rpmlist Source14: devstation_x86_64_rpmlist +Source15: edge_normal_riscv64.xml Requires: createrepo dnf-plugins-core genisoimage isomd5sum grep bash libselinux-utils libxml2 anaconda libselinux-utils Requires: lorax >= 19.6.78-1 @@ -100,6 +101,8 @@ rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/rpmlist.xml cp %{SOURCE8} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/rpmlist.xml rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/riscv64/normal.xml cp %{SOURCE9} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/riscv64/normal.xml +rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/riscv64/edge_normal.xml +cp %{SOURCE15} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/riscv64/edge_normal.xml %endif @@ -154,6 +157,13 @@ install -m 700 %{name}/isomaker/config/riscv64/livecd/live/riscv64.tmpl %{buildr install -m 700 %{name}/isomaker/config/loongarch64/livecd/live/loongarch64.tmpl %{buildroot}/opt/oemaker/config/loongarch64/livecd/live/loongarch64.tmpl install -m 400 %{name}/isomaker/config/loongarch64/ks.cfg %{buildroot}/opt/oemaker/config/loongarch64/ks.cfg %endif +%ifarch riscv64 +install -m 700 %{name}/isomaker/config/riscv64/livecd/live/riscv64.tmpl %{buildroot}/opt/oemaker/config/riscv64/livecd/live/riscv64.tmpl +%endif +%ifarch loongarch64 +install -m 700 %{name}/isomaker/config/loongarch64/livecd/live/loongarch64.tmpl %{buildroot}/opt/oemaker/config/loongarch64/livecd/live/loongarch64.tmpl +install -m 400 %{name}/isomaker/config/loongarch64/ks.cfg %{buildroot}/opt/oemaker/config/loongarch64/ks.cfg +%endif install -m 700 %{name}/isomaker/config/common/livecd/live/* %{buildroot}/opt/oemaker/config/common/livecd/live/ install -m 700 %{name}/isomaker/config/common/livecd/live/* %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/devstation_live/ install -m 400 %{name}/isomaker/config/common/livecd/root_pwd %{buildroot}/opt/oemaker/config/common/livecd/root_pwd @@ -224,6 +234,11 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Fri Apr 18 2025 Liu Wang <1823363429@qq.com> - 3.3.0-7 +- ID:NA +- SUG:NA +- DESC: sync openEuler-24.03-LTS-SP2 branch to master + * Tue Apr 15 2025 Liu Wang <1823363429@qq.com> - 3.3.0-6 - ID:NA - SUG:NA diff --git a/rpmlist.xml b/rpmlist.xml index cf8f80cadb3597c9220a9fbef0f0fbbabd436775..e04a98105488dedc660574fdee71e00867cd92ef 100644 --- a/rpmlist.xml +++ b/rpmlist.xml @@ -1430,10 +1430,14 @@ kubernetes-kubelet kubernetes-master kubernetes-node - kubeedge-cloudcore - kubeedge-edgecore - kubeedge-edgesite - kubeedge-keadm + kubernetes-cloudcore + kubernetes-edgecore + kubernetes-edgesite + kubernetes-keadm + k3s + k3s-selinux + k3s-plugins + k3s-containerd grub2-common grub2-tools-minimal grub2-tools-extra diff --git a/rpmlist_loongarch64.xml b/rpmlist_loongarch64.xml index 3975aae070e2bee06175e66c957b5279ea8d9259..0ea49927c7095a1423dea8bd15244da177aaa577 100644 --- a/rpmlist_loongarch64.xml +++ b/rpmlist_loongarch64.xml @@ -191,6 +191,7 @@ at at-help attr + attr-help audiofile audit audit-help @@ -876,6 +877,7 @@ lockdev lockdev-help logrotate + logrotate-help lshw lshw-help lsof diff --git a/rpmlist_riscv64.xml b/rpmlist_riscv64.xml index 5c7085902698d2029272a57bddbef7fcd4680b05..12d8ef3c3d5835f92c36eb6246cea7c2e26ba192 100644 --- a/rpmlist_riscv64.xml +++ b/rpmlist_riscv64.xml @@ -41,6 +41,23 @@ gnome-boxes nodejs-grunt-contrib-watch python3-keras-rl2 + kernel-rt + kernel-rt-tools + kernel-rt-source + kernel-rt-devel + kernel-rt-headers + kernel-rt-tools-devel + raspberrypi-kernel + raspberrypi-kernel-devel + raspberrypi-kernel-rt + raspberrypi-kernel-rt-devel + haoc-kernel + haoc-kernel-source + haoc-kernel-tools + haoc-kernel-tools-devel + haoc-kernel-devel + haoc-kernel-headers + nvwa drbd @@ -51,12 +68,20 @@ mchange-commons metrics typesafe-config + haoc-kernel + kernel-rt + raspberrypi-kernel + raspberrypi-kernel-rt drbd-debuginfo drbd-debugsource gnome-boxes-debuginfo gnome-boxes-debugsource + kernel-rt-debuginfo + kernel-rt-debugsource + kernel-rt-tools-debuginfo + haoc-kernel-debugsource edk2-aarch64 @@ -72,6 +97,7 @@ kata-containers DCF opengauss + oeAware-manager edk2-ovmf @@ -87,6 +113,7 @@ edk2-ovmf-riscv64 grub2-efi-riscv64 grub2-efi-riscv64-modules + oeAware-manager abattis-cantarell-fonts @@ -119,6 +146,7 @@ at at-help attr + attr-help atune atune-client atune-db @@ -479,6 +507,7 @@ json-c-help json-glib json-glib-help + kata-containers kbd kbd-help kbd-legacy @@ -814,6 +843,7 @@ lockdev lockdev-help logrotate + logrotate-help lshw lshw-help lsof @@ -1312,6 +1342,7 @@ tpm2-abrmd tpm2-abrmd-help tpm2-tools + tpm2-tools-help tpm2-tss tpm2-tss-help traceroute @@ -1393,7 +1424,8 @@ zziplib-utils unixODBC-devel jemalloc-devel - + DCF + opengauss grub2-efi-aa64 @@ -1417,6 +1449,13 @@ grub2-pc-modules grub2-efi-x64 shim + + + grub2-efi-riscv64 + grub2-efi-riscv64-cdboot + grub2-efi-riscv64-modules + + kubernetes kubernetes-client kubernetes-help @@ -1428,8 +1467,10 @@ kubeedge-edgecore kubeedge-edgesite kubeedge-keadm - - + k3s + k3s-selinux + k3s-plugins + k3s-containerd grub2-common grub2-tools-minimal grub2-tools-extra