diff --git a/0001-bugfix-IABY7K.patch b/0001-bugfix-IABY7K.patch
index e559a9def5e666079163ffe1c29cd016247c779a..129e06731cbd2e8ad5ddd1a006c6a7841e0fe9ef 100644
--- a/0001-bugfix-IABY7K.patch
+++ b/0001-bugfix-IABY7K.patch
@@ -8,7 +8,7 @@ diff --git a/isomaker/rpm.sh b/isomaker/rpm.sh
 index a9efe4b..b2ba4de 100644
 --- a/isomaker/rpm.sh
 +++ b/isomaker/rpm.sh
-@@ -185,7 +185,7 @@ function get_desktop_rpms()
+@@ -203,7 +203,7 @@ function get_desktop_rpms()
  
  function get_everything_rpms()
  {
@@ -17,7 +17,7 @@ index a9efe4b..b2ba4de 100644
      parse_rpmlist_xml "exclude"
      cat parsed_rpmlist_exclude
      if [ -s parsed_rpmlist_exclude ];then
-@@ -259,7 +259,7 @@ function everything_source_rpms_download()
+@@ -277,7 +277,7 @@ function everything_source_rpms_download()
  function everything_debug_rpms_download()
  {
      mkdir ${EVERY_DEBUG_DIR}
diff --git a/devstation_aarch64_rpmlist b/devstation_aarch64_rpmlist
new file mode 100644
index 0000000000000000000000000000000000000000..7fffa1c7f855201bbd2b14addcce2d82c732151d
--- /dev/null
+++ b/devstation_aarch64_rpmlist
@@ -0,0 +1,125 @@
+abattis-cantarell-fonts
+audit
+authselect
+basesystem
+bash
+bind
+bind-dnssec-utils
+boost-iostreams
+checkpolicy
+code
+coreutils
+cronie
+cryptsetup
+CUnit
+CUnit-devel
+curl
+dejavu-fonts
+devstation-config
+dhcp
+dnf
+dnf-plugins-core
+dosfstools
+dracut-config-generic
+dracut-config-rescue
+dracut-live
+dracut-network
+e2fsprogs
+efibootmgr
+filesystem
+fipscheck
+firefox
+firewalld
+gdb
+gdm
+git
+glibc
+gnome-menus
+gnome-session
+gnome-shell
+gnome-software
+gnome-terminal
+google-*-fonts
+grub2
+grub2-efi
+grub2-efi-aa64-cdboot
+grubby
+gtest
+gtest-devel
+hostname
+ibus-libpinyin
+initscripts
+ipmitool
+iproute
+iprutils
+iputils
+irqbalance
+java-21-openjdk-devel
+kbd
+kernel
+kernel-tools
+kexec-tools
+less
+libdaemon
+liberation-fonts
+libnet
+libteam
+libX11
+linux-firmware
+lshw
+lsscsi
+lvm2
+man-db
+nautilus
+ncurses
+net-snmp
+NetworkManager
+NetworkManager-config-server
+openEuler-latest-release
+openEuler-logos
+openEuler-release
+openssh
+openssh-clients
+openssh-server
+open-vm-tools
+open-vm-tools-desktop
+parted
+passwd
+perf
+policycoreutils
+procps-ng
+python3-decorator
+python3-ply
+python3-pytest
+python3-slip
+rdma-core
+rng-tools
+rootfiles
+rpm
+rsync
+rsyslog
+samba-client
+samba-libs
+security-tool
+selinux-policy-mls
+selinux-policy-targeted
+setup
+sg3_utils
+shadow
+shim
+sssd
+sudo
+sysfsutils
+systemd
+tuned
+unzip
+util-linux
+vim-minimal
+wget
+wqy-zenhei-fonts
+xdg-utils
+xfsprogs
+xorg-x11-drv-*
+yum
+linux-firmware-iwlwifi
+linux-firmware-mediatek
diff --git a/devstation_x86_64_rpmlist b/devstation_x86_64_rpmlist
new file mode 100644
index 0000000000000000000000000000000000000000..6df3830a74832d36b6e12b6808381385b00db158
--- /dev/null
+++ b/devstation_x86_64_rpmlist
@@ -0,0 +1,147 @@
+abattis-cantarell-fonts
+audit
+authselect
+basesystem
+bash
+bind
+bind-dnssec-utils
+boost-iostreams
+btrfs-progs
+checkpolicy
+code
+coreutils
+cronie
+cryptsetup
+CUnit
+CUnit-devel
+curl
+dejavu-fonts
+devstation-config
+dhcp
+dnf
+dnf-plugins-core
+dosfstools
+dracut-config-generic
+dracut-config-rescue
+dracut-live
+dracut-network
+e2fsprogs
+efibootmgr
+filesystem
+findutils
+fipscheck
+firefox
+firewalld
+gdb
+gdm
+genisoimage
+git
+glibc
+gnome-bluetooth
+gnome-bluetooth-libs
+gnome-menus
+gnome-session
+gnome-shell
+gnome-software
+gnome-terminal
+google-*-fonts
+grub2
+grub2-efi-ia32-cdboot
+grub2-efi-x64
+grub2-efi-x64-cdboot
+grub2-pc
+grubby
+gtest
+gtest-devel
+gtk2
+hostname
+ibus-libpinyin
+initscripts
+ipmitool
+iproute
+iprutils
+iputils
+irqbalance
+java-21-openjdk-devel
+kbd
+kernel
+kernel-tools
+kexec-tools
+lcms2
+less
+lftp
+libdaemon
+liberation-fonts
+libgusb
+libiscsi
+libnet
+libnl3
+libpciaccess
+libteam
+libusbx
+libX11
+linux-firmware
+lshw
+lsscsi
+lvm2
+lzo
+man-db
+nautilus
+ncurses
+net-snmp
+net-tools
+NetworkManager
+NetworkManager-config-server
+nfs-utils
+openEuler-latest-release
+openEuler-logos
+openEuler-release
+openssh
+openssh-clients
+openssh-server
+parted
+passwd
+pciutils
+perf
+policycoreutils
+procps-ng
+python3-decorator
+python3-ply
+python3-pytest
+python3-slip
+rdma-core
+rest
+rng-tools
+rootfiles
+rpm
+rsync
+rsyslog
+samba-client
+samba-libs
+security-tool
+selinux-policy-mls
+selinux-policy-targeted
+setup
+sg3_utils
+shadow
+shim
+smartmontools
+sssd
+sudo
+sysfsutils
+syslinux
+systemd
+tuned
+unzip
+util-linux
+vim-enhanced
+vim-minimal
+wget
+wqy-zenhei-fonts
+xdg-utils
+xfsprogs
+xorg-x11-drv-*
+yum
+zip
+linux-firmware-iwlwifi
+linux-firmware-mediatek
diff --git a/enable-efi-boot-for-loongarch64.patch b/enable-efi-boot-for-loongarch64.patch
deleted file mode 100644
index a877bcee905af5ab49a1bec96b6a6ffc7b50fc69..0000000000000000000000000000000000000000
--- a/enable-efi-boot-for-loongarch64.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From b325c0dcbb7ad90448aad6d99752ce08f9c90f5d Mon Sep 17 00:00:00 2001
-From: Wenlong Zhang <zhangwenlong@loongson.cn>
-Date: Tue, 26 Nov 2024 10:36:46 +0800
-Subject: [PATCH] enable efi boot for loongarch64
-
----
- .../loongarch64/livecd/live/loongarch64.tmpl  |  4 +-
- isomaker/iso.sh                               | 46 +++++++++++++++----
- 2 files changed, 39 insertions(+), 11 deletions(-)
-
-diff --git a/isomaker/config/loongarch64/livecd/live/loongarch64.tmpl b/isomaker/config/loongarch64/livecd/live/loongarch64.tmpl
-index daf68c1..b18ffc9 100644
---- a/isomaker/config/loongarch64/livecd/live/loongarch64.tmpl
-+++ b/isomaker/config/loongarch64/livecd/live/loongarch64.tmpl
-@@ -65,9 +65,11 @@ mkdir ${KERNELDIR}
- 
- %if exists("boot/efi/EFI/*/grubloongarch64.efi"):
- ## make boot.iso
--runcmd mkisofs -o ${outroot}/images/boot.iso \
-+runcmd xorriso as mkisofs -o ${outroot}/images/boot.iso \
-        ${efiargs} -R -J -V '${isolabel}' -T ${udfargs} \
-        -graft-points \
-+       -efi-boot-part \
-+       --efi-boot-image \
-        ${KERNELDIR}=${outroot}/${KERNELDIR} \
-        ${LIVEDIR}=${outroot}/${LIVEDIR} \
-        ${efigraft} ${filegraft}
-diff --git a/isomaker/iso.sh b/isomaker/iso.sh
-index 9c0cb0f..a70eb15 100755
---- a/isomaker/iso.sh
-+++ b/isomaker/iso.sh
-@@ -26,9 +26,13 @@ function gen_debug_iso()
-     if [ "$ARCH" == "x86_64" ]; then
-         mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${DBG_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table  -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-         [ $? != 0 ] && return 1
--    elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ] || [ "$ARCH" == "riscv64" ]; then
-+    elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "riscv64" ]; then
-         mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${DBG_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-         [ $? != 0 ] && return 1
-+    elif [ "$ARCH" == "loongarch64" ]; then
-+        # Enable EFI boot loongarch64
-+        xorriso as mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${DBG_ISO_NAME}" -efi-boot-part --efi-boot-image -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-+        [ $? != 0 ] && return 1
-     elif [ "$ARCH" == "ppc64le" ]; then
-         mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${DBG_ISO_NAME}" -part -hfs -r -l -sysid "${SYSID_PPC}" -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275  -no-desktop -allow-multidot "${BUILD}"/iso
-         [ $? != 0 ] && return 1
-@@ -43,9 +47,12 @@ function gen_standard_iso()
-         mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table  -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-         [ $? != 0 ] && return 1
-         isohybrid -u "${OUTPUT_DIR}/${STANDARD_ISO_NAME}"
--    elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ] || [ "$ARCH" == "riscv64" ]; then
-+    elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "riscv64" ]; then
-         mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-         [ $? != 0 ] && return 1
-+    elif [ "$ARCH" == "loongarch64" ]; then
-+        xorriso as mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -efi-boot-part --efi-boot-image -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-+        [ $? != 0 ] && return 1
-     elif [ "$ARCH" == "ppc64le" ]; then
-         mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid "${SYSID_PPC}" -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275  -no-desktop -allow-multidot "${BUILD}"/iso
-         [ $? != 0 ] && return 1
-@@ -63,9 +70,12 @@ function gen_edge_iso()
-     if [ "$ARCH" == "x86_64" ]; then
-         mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${EDGE_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table  -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-         [ $? != 0 ] && return 1
--    elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ] || [ "$ARCH" == "riscv64" ]; then
-+    elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "riscv64" ]; then
-         mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${EDGE_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-         [ $? != 0 ] && return 1
-+    elif [ "$ARCH" == "loongarch64" ]; then
-+        xorriso as mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${EDGE_ISO_NAME}" -efi-boot-part --efi-boot-image -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-+        [ $? != 0 ] && return 1
-     elif [ "$ARCH" == "ppc64le" ]; then
-         mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid "${SYSID_PPC}" -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275  -no-desktop -allow-multidot "${BUILD}"/iso
-         [ $? != 0 ] && return 1
-@@ -83,9 +93,12 @@ function gen_desktop_iso()
-     if [ "$ARCH" == "x86_64" ]; then
-         mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${DESKTOP_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table  -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-         [ $? != 0 ] && return 1
--    elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ] || [ "$ARCH" == "riscv64" ]; then
-+    elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "riscv64" ]; then
-         mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${DESKTOP_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-         [ $? != 0 ] && return 1
-+    elif [ "$ARCH" == "loongarch64" ]; then
-+        xorriso as mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${DESKTOP_ISO_NAME}" -efi-boot-part --efi-boot-image -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-+        [ $? != 0 ] && return 1
-     elif [ "$ARCH" == "ppc64le" ]; then
-         mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid "${SYSID_PPC}" -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275  -no-desktop -allow-multidot "${BUILD}"/iso
-         [ $? != 0 ] && return 1
-@@ -103,9 +116,12 @@ function gen_src_iso()
-     if [ "$ARCH" == "x86_64" ]; then
-         mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${SRC_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table  -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-         [ $? != 0 ] && return 1
--    elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ] || [ "$ARCH" == "riscv64" ]; then
-+    elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "riscv64" ]; then
-         mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${SRC_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-         [ $? != 0 ] && return 1
-+    elif [ "$ARCH" == "loongarch64" ]; then
-+        xorriso as mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o "${OUTPUT_DIR}/${SRC_ISO_NAME}" -efi-boot-part --efi-boot-image -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-+        [ $? != 0 ] && return 1
-     elif [ "$ARCH" == "ppc64le" ]; then
-         mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid "${SYSID_PPC}" -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275  -no-desktop -allow-multidot "${BUILD}"/iso
-         [ $? != 0 ] && return 1
-@@ -125,9 +141,12 @@ function gen_everything_iso()
-         mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${EVE_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table  -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-         [ $? != 0  ] && return 1
-         isohybrid -u /result/"${EVE_ISO_NAME}"
--    elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ] || [ "$ARCH" == "riscv64" ]; then
-+    elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "riscv64" ]; then
-         mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${EVE_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-         [ $? != 0  ] && return 1
-+    elif [ "$ARCH" == "loongarch64" ]; then
-+        xorriso as mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${EVE_ISO_NAME}" -efi-boot-part --efi-boot-image -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-+        [ $? != 0  ] && return 1
-     elif [ "$ARCH" == "ppc64le" ]; then
-         mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid "${SYSID_PPC}" -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275  -no-desktop -allow-multidot "${BUILD}"/iso
-         [ $? != 0 ] && return 1
-@@ -147,9 +166,12 @@ function gen_everything_debug_iso()
-     if [ "$ARCH" == "x86_64"  ]; then
-         mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${EVE_DEBUG_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table  -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-         [ $? != 0  ] && return 1
--    elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ] || [ "$ARCH" == "riscv64" ]; then
-+    elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "riscv64" ]; then
-         mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${EVE_DEBUG_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-         [ $? != 0  ] && return 1
-+    elif [ "$ARCH" == "loongarch64" ]; then
-+        xorriso as mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${EVE_DEBUG_ISO_NAME}" -efi-boot-part --efi-boot-image -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-+        [ $? != 0  ] && return 1
-     elif [ "$ARCH" == "ppc64le" ]; then
-         mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid "${SYSID_PPC}" -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275  -no-desktop -allow-multidot "${BUILD}"/iso
-         [ $? != 0 ] && return 1
-@@ -169,13 +191,15 @@ function gen_everything_src_iso()
-     if [ "$ARCH" == "x86_64"  ]; then
-         mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${EVE_SRC_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table  -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-         [ $? != 0  ] && return 1
--    elif [ "$ARCH" == "aarch64"  ] || [ "$ARCH" == "loongarch64" ] || [ "$ARCH" == "riscv64" ]; then
-+    elif [ "$ARCH" == "aarch64"  ] || [ "$ARCH" == "riscv64" ]; then
-         mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${EVE_SRC_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-         [ $? != 0  ] && return 1
-+    elif [ "$ARCH" == "loongarch64" ]; then
-+        xorriso as mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${EVE_SRC_ISO_NAME}" -efi-boot-part --efi-boot-image -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-+        [ $? != 0  ] && return 1
-     elif [ "$ARCH" == "ppc64le" ]; then
-         mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid "${SYSID_PPC}" -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275  -no-desktop -allow-multidot "${BUILD}"/iso
-         [ $? != 0 ] && return 1
--
-     fi
-     implantisomd5 /result/"${EVE_SRC_ISO_NAME}"
-     return 0
-@@ -187,8 +211,10 @@ function gen_netinst_iso()
-         mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${NETINST_ISO_NAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table  -eltorito-alt-boot -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-         [ $? != 0  ] && return 1
-         isohybrid -u /result/"${NETINST_ISO_NAME}"
--    elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "loongarch64" ] || [ "$ARCH" == "riscv64" ]; then
-+    elif [ "$ARCH" == "aarch64" ] || [ "$ARCH" == "riscv64" ]; then
-         mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${NETINST_ISO_NAME}" -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-+    elif [ "$ARCH" == "loongarch64" ]; then
-+        xorriso as mkisofs -R -J -T -r -l -d -joliet-long -allow-multidot -allow-leading-dots -no-bak -V "${RELEASE_NAME}" -o /result/"${NETINST_ISO_NAME}" -efi-boot-part --efi-boot-image -e images/efiboot.img -no-emul-boot "${BUILD}"/iso
-     elif [ "$ARCH" == "ppc64le" ]; then
-         mkisofs -joliet-long -U -J -R -T -o "${OUTPUT_DIR}/${STANDARD_ISO_NAME}" -part -hfs -r -l -sysid "${SYSID_PPC}" -V "${RELEASE_NAME}" -chrp-boot -hfs-bless boot/grub/powerpc-ieee1275  -no-desktop -allow-multidot "${BUILD}"/iso
-         [ $? != 0 ] && return 1
--- 
-2.43.0
-
diff --git a/oemaker-3.2.0.tar.gz b/oemaker-3.2.0.tar.gz
deleted file mode 100644
index d7eb20e5133ea9021b47872eede8de4307c66a96..0000000000000000000000000000000000000000
Binary files a/oemaker-3.2.0.tar.gz and /dev/null differ
diff --git a/oemaker-3.3.0.tar.gz b/oemaker-3.3.0.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..d0045f1a547f39e0a6dc11a0711cc1c3a33ab41a
Binary files /dev/null and b/oemaker-3.3.0.tar.gz differ
diff --git a/oemaker.spec b/oemaker.spec
index d8e490263f2857b14fbe98b8607b0a16f540b74b..3a5a2c3b0668dfde7c7ddfbf69d7a844ec382153 100644
--- a/oemaker.spec
+++ b/oemaker.spec
@@ -14,8 +14,8 @@ Name:           oemaker
 Summary:        a building tool for DVD ISO making and ISO cutting
 License:        Mulan PSL v2
 Group:          System/Management
-Version:        3.2.0
-Release:        11
+Version:        3.3.0
+Release:        1
 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:       devstation_aarch64_rpmlist
+Source14:       devstation_x86_64_rpmlist
 
 Requires:       createrepo dnf-plugins-core genisoimage isomd5sum grep bash libselinux-utils libxml2 anaconda libselinux-utils
 Requires:       lorax >= 19.6.78-1
@@ -41,7 +43,6 @@ Requires:       xorriso
 # Patch here
 Patch0001:      0001-bugfix-IABY7K.patch
 Patch0002:      0001-fix-livecd-grub2-efi.cfg-not-found.patch
-Patch0003:	enable-efi-boot-for-loongarch64.patch
 
 %description
 a building tool for DVD ISO making and ISO cutting
@@ -87,6 +88,10 @@ rm -rf  %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/desktop_n
 cp %{SOURCE7} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/desktop_normal.xml
 rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/loongarch64/desktop_normal.xml
 cp %{SOURCE12} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/loongarch64/desktop_normal.xml
+rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/aarch64/livecd/devstation_rpmlist
+cp %{SOURCE13} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/aarch64/livecd/devstation_rpmlist
+rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/livecd/devstation_rpmlist
+cp %{SOURCE14} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/livecd/devstation_rpmlist
 cd %{_builddir}/%{name}-%{version}/%{name}
 %autopatch -p1
 %ifarch riscv64
@@ -104,6 +109,7 @@ mkdir -p %{buildroot}/opt/oemaker
 mkdir -p %{buildroot}/opt/oemaker/config
 mkdir -p %{buildroot}/opt/oemaker/config/${sys_arch}
 mkdir -p %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/live/config_files/${sys_arch}
+mkdir -p %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/devstation_live/config_files/${sys_arch}
 mkdir -p %{buildroot}/opt/oemaker/config/common
 mkdir -p %{buildroot}/opt/oemaker/config/common/livecd/live
 mkdir -p %{buildroot}/opt/oemaker/docs
@@ -122,18 +128,23 @@ install -m 700 %{name}/isomaker/env_record.sh %{buildroot}/opt/oemaker/env_recor
 install -m 700 %{name}/isomaker/env_restore.sh %{buildroot}/opt/oemaker/env_restore.sh
 install -m 400 %{name}/isomaker/config/rpmlist.xml %{buildroot}/opt/oemaker/config/rpmlist.xml
 install -m 640 %{name}/isomaker/config/${sys_arch}/livecd/live/config_files/${sys_arch}/* %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/live/config_files/${sys_arch}/
+install -m 640 %{name}/isomaker/config/${sys_arch}/livecd/devstation_live/config_files/${sys_arch}/* %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/devstation_live/config_files/${sys_arch}/
 install -m 400 %{name}/isomaker/config/${sys_arch}/livecd/livecd_${sys_arch}.ks %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/livecd_${sys_arch}.ks
+install -m 400 %{name}/isomaker/config/${sys_arch}/livecd/devstation_livecd_${sys_arch}.ks %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/devstation_livecd_${sys_arch}.ks
 install -m 600 %{name}/isomaker/config/${sys_arch}/livecd/rpmlist %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/rpmlist
+install -m 600 %{name}/isomaker/config/${sys_arch}/livecd/devstation_rpmlist %{buildroot}/opt/oemaker/config/${sys_arch}/livecd/devstation_rpmlist
 install -m 400 %{name}/isomaker/config/${sys_arch}/desktop_normal.xml %{buildroot}/opt/oemaker/config/${sys_arch}/desktop_normal.xml
 install -m 400 %{name}/isomaker/config/${sys_arch}/edge_normal.xml %{buildroot}/opt/oemaker/config/${sys_arch}/edge_normal.xml
 install -m 400 %{name}/isomaker/config/${sys_arch}/normal.xml %{buildroot}/opt/oemaker/config/${sys_arch}/normal.xml
 install -m 400 %{name}/isomaker/config/${sys_arch}/standard.conf %{buildroot}/opt/oemaker/config/${sys_arch}/standard.conf
 %ifarch x86_64
 install -m 700 %{name}/isomaker/config/x86_64/livecd/live/x86.tmpl %{buildroot}/opt/oemaker/config/x86_64/livecd/live/x86.tmpl
+install -m 700 %{name}/isomaker/config/x86_64/livecd/devstation_live/x86.tmpl %{buildroot}/opt/oemaker/config/x86_64/livecd/devstation_live/x86.tmpl
 install -m 400 %{name}/isomaker/config/x86_64/ks.cfg %{buildroot}/opt/oemaker/config/x86_64/ks.cfg
 %endif
 %ifarch aarch64
 install -m 700 %{name}/isomaker/config/aarch64/livecd/live/aarch64.tmpl %{buildroot}/opt/oemaker/config/aarch64/livecd/live/aarch64.tmpl
+install -m 700 %{name}/isomaker/config/aarch64/livecd/devstation_live/aarch64.tmpl %{buildroot}/opt/oemaker/config/aarch64/livecd/devstation_live/aarch64.tmpl
 %endif
 %ifarch riscv64
 install -m 700 %{name}/isomaker/config/riscv64/livecd/live/riscv64.tmpl %{buildroot}/opt/oemaker/config/riscv64/livecd/live/riscv64.tmpl
@@ -143,6 +154,7 @@ install -m 700 %{name}/isomaker/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
 install -m 700 %{name}/isomaker/docs/* %{buildroot}/opt/oemaker/docs/
 cp -ar %{name}/isomaker/80-openeuler %{buildroot}/opt/oemaker/
@@ -211,6 +223,11 @@ rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}
 
 %changelog
+* Thu Jan 23 2025 Li Ping <1477412247@qq.com> - 3.3.0-1
+- ID:NA
+- SUG:NA
+- DESC: add new iso_type devstation devstation_netinst support for oemaker and update to 3.3.0
+
 * Mon Dec 30 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 3.2.0-11
 - ID:NA
 - SUG:NA