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/normal_riscv64.xml b/normal_riscv64.xml
index 175a94c893ca645877327e55c48a9de89260e337..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
diff --git a/oemaker.spec b/oemaker.spec
index d8e490263f2857b14fbe98b8607b0a16f540b74b..ef44672183b64c1f4eb65e12ff1225888440cf50 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.2.0
-Release: 11
+Release: 12
BuildRoot: %{_tmppath}/%{name}
Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -31,6 +31,8 @@ Source9: normal_riscv64.xml
Source10: normal_loongarch64.xml
Source11: rpmlist_loongarch64.xml
Source12: desktop_normal_loongarch64.xml
+Source13: 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
@@ -94,6 +96,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 %{SOURCE13} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/riscv64/edge_normal.xml
%endif
@@ -211,6 +215,9 @@ rm -rf %{buildroot}
rm -rf $RPM_BUILD_DIR/%{name}
%changelog
+* Mon Jan 13 2025 Ouuleilei - 3.2.0-12
+- update 24.03LTS-SP1 riscv64 rpmlist.xml normal.xml and add edge_normal_riscv64.xml
+
* Mon Dec 30 2024 Wenlong Zhang - 3.2.0-11
- ID:NA
- SUG:NA
diff --git a/rpmlist_riscv64.xml b/rpmlist_riscv64.xml
index 639459d93c0884a9acfb28fcf471ed0a0db8f961..e8c57d81737a84a7b30daf709d046ea59733b8e6 100644
--- a/rpmlist_riscv64.xml
+++ b/rpmlist_riscv64.xml
@@ -40,23 +40,42 @@
drbd-utils
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
gnome-boxes
nodejs-grunt-contrib-watch
- apache-commons-vfs
- apache-poi
- 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
@@ -68,25 +87,19 @@
uadk_engine
libwd
shim-aa64
- librados2
- kata-containers
- DCF
- opengauss
+ oeAware-manager
edk2-ovmf
grub2-efi-x64
grub2-efi-x64-modules
shim
- librados2
- kata-containers
- DCF
- opengauss
+ oeAware-manager
- edk2-ovmf-riscv64
- grub2-efi-riscv64
- grub2-efi-riscv64-modules
+ edk2-ovmf-riscv64
+ grub2-efi-riscv64
+ grub2-efi-riscv64-modules
abattis-cantarell-fonts
@@ -480,6 +493,7 @@
json-c-help
json-glib
json-glib-help
+ kata-containers
kbd
kbd-help
kbd-legacy
@@ -666,7 +680,7 @@
libpsl-help
libpwquality
libpwquality-help
- librados2
+ librados2
libref_array
librepo
libreport-filesystem
@@ -755,7 +769,7 @@
libvirt-daemon-driver-storage-mpath
libvirt-daemon-driver-storage-rbd
libvirt-daemon-driver-storage-scsi
- libvirt-daemon-kvm
+ libvirt-daemon-kvm
libvirt-daemon-qemu
libvirt-devel
libvirt-docs
@@ -1120,7 +1134,7 @@
python3-librepo
python3-libs
python3-libselinux
- python3-libvirt
+ python3-libvirt
python3-libxml2
python3-linux-procfs
python3-net-snmp
@@ -1396,30 +1410,27 @@
zziplib-utils
unixODBC-devel
jemalloc-devel
-
+ DCF
+ opengauss
grub2-efi-aa64
grub2-efi-aa64-cdboot
grub2-efi-aa64-modules
shim
- kubernetes
- kubernetes-client
- kubernetes-help
- kubernetes-kubeadm
- kubernetes-kubelet
- kubernetes-master
- kubernetes-node
- kubeedge-cloudcore
- kubeedge-edgecore
- kubeedge-edgesite
- kubeedge-keadm
grub2-pc
grub2-pc-modules
grub2-efi-x64
shim
+
+
+ grub2-efi-riscv64
+ grub2-efi-riscv64-cdboot
+ grub2-efi-riscv64-modules
+
+
kubernetes
kubernetes-client
kubernetes-help
@@ -1427,12 +1438,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