From 9a408a0b2dc0dc82a343adc0b2da7fa7c93106d6 Mon Sep 17 00:00:00 2001
From: lw520203 <1823363429@qq.com>
Date: Mon, 25 Aug 2025 09:45:05 +0800
Subject: [PATCH 1/9] add softwores for devstation

---
 devstation_aarch64_rpmlist | 10 ++++++++++
 devstation_x86_64_rpmlist  | 10 ++++++++++
 oemaker.spec               |  7 ++++++-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/devstation_aarch64_rpmlist b/devstation_aarch64_rpmlist
index e5344ca..5b555b9 100644
--- a/devstation_aarch64_rpmlist
+++ b/devstation_aarch64_rpmlist
@@ -192,3 +192,13 @@ uv
 python3-mcp
 nodejs-packaging
 tigervnc
+microcode_ctl
+grub2-efi-x64-modules
+grub2-common
+devchat
+dev-store
+python3-django-rest-framework
+desktop-pet
+xdotool
+libxdo
+libxdo-devel
diff --git a/devstation_x86_64_rpmlist b/devstation_x86_64_rpmlist
index 2ef7053..9e758bd 100644
--- a/devstation_x86_64_rpmlist
+++ b/devstation_x86_64_rpmlist
@@ -214,3 +214,13 @@ uv
 python3-mcp
 nodejs-packaging
 tigervnc
+microcode_ctl
+grub2-efi-x64-modules
+grub2-common
+devchat
+dev-store
+python3-django-rest-framework
+desktop-pet
+xdotool
+libxdo
+libxdo-devel
diff --git a/oemaker.spec b/oemaker.spec
index f1cab55..7272f52 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:        13
+Release:        14
 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
+* Mon Aug 25 2025 Liu Wang <1823363429@qq.com> - 3.3.0-14
+- ID:NA
+- SUG:NA
+- DESC: add softwores for devstation
+
 * Mon Aug 11 2025 Liu Wang <1823363429@qq.com> - 3.3.0-13
 - ID:NA
 - SUG:NA
-- 
Gitee


From 0a4f33742632027bf0a9a6b3473d98d68938a30c Mon Sep 17 00:00:00 2001
From: lw520203 <1823363429@qq.com>
Date: Tue, 26 Aug 2025 16:13:15 +0800
Subject: [PATCH 2/9] xxx

---
 ...lace-devstation-installer-to-heolleo.patch | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/0001-replace-devstation-installer-to-heolleo.patch b/0001-replace-devstation-installer-to-heolleo.patch
index c9694df..7c12548 100644
--- a/0001-replace-devstation-installer-to-heolleo.patch
+++ b/0001-replace-devstation-installer-to-heolleo.patch
@@ -1,19 +1,19 @@
-From 57be227af5124e89778dd2ffd6bac7a5e0e7cbb5 Mon Sep 17 00:00:00 2001
+From cea761dce52291f70ce84e22fdf65cde6b47be07 Mon Sep 17 00:00:00 2001
 From: lw520203 <1823363429@qq.com>
-Date: Mon, 25 Aug 2025 10:24:34 +0800
+Date: Tue, 26 Aug 2025 16:11:57 +0800
 Subject: [PATCH] replace devstation installer to heolleo
 
 ---
- isomaker/config/aarch64/livecd/devstation_livecd_aarch64.ks | 4 ++--
- isomaker/config/x86_64/livecd/devstation_livecd_x86_64.ks   | 4 ++--
+ isomaker/config/aarch64/livecd/devstation_livecd_aarch64.ks | 4 +---
+ isomaker/config/x86_64/livecd/devstation_livecd_x86_64.ks   | 3 +--
  isomaker/iso.sh                                             | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
+ 3 files changed, 3 insertions(+), 6 deletions(-)
 
 diff --git a/isomaker/config/aarch64/livecd/devstation_livecd_aarch64.ks b/isomaker/config/aarch64/livecd/devstation_livecd_aarch64.ks
-index be247e6..5b3cf47 100644
+index be247e6..e8f3c45 100644
 --- a/isomaker/config/aarch64/livecd/devstation_livecd_aarch64.ks
 +++ b/isomaker/config/aarch64/livecd/devstation_livecd_aarch64.ks
-@@ -64,12 +64,12 @@ polkit.addRule(function(action, subject) {
+@@ -64,13 +64,11 @@ polkit.addRule(function(action, subject) {
  });
  EOR
  
@@ -24,15 +24,15 @@ index be247e6..5b3cf47 100644
  systemctl set-default graphical.target
  
 -systemctl enable calamares
-+systemctl enable heolleo
- 
+-
  su - devstation -c gsettings set org.gnome.desktop.input-sources sources "[(xkb, us), (ibus, libpinyin)]"
  
+ touch /etc/sysconfig/network
 diff --git a/isomaker/config/x86_64/livecd/devstation_livecd_x86_64.ks b/isomaker/config/x86_64/livecd/devstation_livecd_x86_64.ks
-index 488a71c..febaad2 100644
+index 488a71c..364bfe4 100644
 --- a/isomaker/config/x86_64/livecd/devstation_livecd_x86_64.ks
 +++ b/isomaker/config/x86_64/livecd/devstation_livecd_x86_64.ks
-@@ -66,10 +66,10 @@ polkit.addRule(function(action, subject) {
+@@ -66,10 +66,9 @@ polkit.addRule(function(action, subject) {
      }
  });
  EOR
@@ -41,12 +41,11 @@ index 488a71c..febaad2 100644
  systemctl enable gdm
  systemctl set-default graphical.target
 -systemctl enable calamares
-+systemctl enable heolleo
  su - devstation -c gsettings set org.gnome.desktop.input-sources sources "[('xkb', 'us'), ('ibus', 'libpinyin')]"
  
  touch /etc/sysconfig/network
 diff --git a/isomaker/iso.sh b/isomaker/iso.sh
-index 2bb52ac..727f905 100755
+index 2bb52ac..cba3c31 100755
 --- a/isomaker/iso.sh
 +++ b/isomaker/iso.sh
 @@ -307,7 +307,7 @@ function gen_devstation_livecd_iso() {
@@ -54,7 +53,7 @@ index 2bb52ac..727f905 100755
      sed -i 's#ROOT_PWD#'${root_pwd}'#' ${cfg_dir}/devstation_livecd_${ARCH}.ks
      sed -i 's#INSTALL_REPO#'${INSTALL_URL}'#' ${cfg_dir}/devstation_livecd_${ARCH}.ks
 -    extra_packages="calamares calamares-devel calamares-interactiveterminal calamares-libs kpmcore kpmcore-devel"
-+    extra_packages="heolleo"
++    extra_packages="heolleo archinstall"
      rpmlist="${rpmlist} ${extra_packages}"
      for rpm_name in ${rpmlist}
      do
-- 
Gitee


From 1457aef00da16d77286e9c3a622f7e8792cad4a2 Mon Sep 17 00:00:00 2001
From: lw520203 <1823363429@qq.com>
Date: Wed, 27 Aug 2025 12:36:25 +0800
Subject: [PATCH 3/9] xxx

---
 devstation_aarch64_rpmlist | 2 +-
 devstation_x86_64_rpmlist  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/devstation_aarch64_rpmlist b/devstation_aarch64_rpmlist
index 5b555b9..bcd0878 100644
--- a/devstation_aarch64_rpmlist
+++ b/devstation_aarch64_rpmlist
@@ -195,7 +195,7 @@ tigervnc
 microcode_ctl
 grub2-efi-x64-modules
 grub2-common
-devchat
+deepchat
 dev-store
 python3-django-rest-framework
 desktop-pet
diff --git a/devstation_x86_64_rpmlist b/devstation_x86_64_rpmlist
index 9e758bd..77f5120 100644
--- a/devstation_x86_64_rpmlist
+++ b/devstation_x86_64_rpmlist
@@ -217,7 +217,7 @@ tigervnc
 microcode_ctl
 grub2-efi-x64-modules
 grub2-common
-devchat
+deepchat
 dev-store
 python3-django-rest-framework
 desktop-pet
-- 
Gitee


From d4b0387952ea876af4f7267a6b8bbfd52098cdc9 Mon Sep 17 00:00:00 2001
From: lw520203 <1823363429@qq.com>
Date: Wed, 27 Aug 2025 13:00:44 +0800
Subject: [PATCH 4/9] xxx

---
 oemaker.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oemaker.spec b/oemaker.spec
index 17e16da..b5a976f 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:        16
+Release:        21
 BuildRoot:      %{_tmppath}/%{name}
 
 Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-- 
Gitee


From 403a87f02c5d543044355f8a67ebf765fcf7d85e Mon Sep 17 00:00:00 2001
From: lw520203 <1823363429@qq.com>
Date: Thu, 28 Aug 2025 15:03:05 +0800
Subject: [PATCH 5/9] xxx

---
 oemaker.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oemaker.spec b/oemaker.spec
index b5a976f..4cf871b 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:        21
+Release:        23
 BuildRoot:      %{_tmppath}/%{name}
 
 Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-- 
Gitee


From 1fe1f0654568ee0500373ea494e751a20d4cf5fa Mon Sep 17 00:00:00 2001
From: lw520203 <1823363429@qq.com>
Date: Thu, 28 Aug 2025 15:16:31 +0800
Subject: [PATCH 6/9] xxx

---
 devstation_aarch64_rpmlist | 1 -
 1 file changed, 1 deletion(-)

diff --git a/devstation_aarch64_rpmlist b/devstation_aarch64_rpmlist
index bcd0878..5bb5ec4 100644
--- a/devstation_aarch64_rpmlist
+++ b/devstation_aarch64_rpmlist
@@ -192,7 +192,6 @@ uv
 python3-mcp
 nodejs-packaging
 tigervnc
-microcode_ctl
 grub2-efi-x64-modules
 grub2-common
 deepchat
-- 
Gitee


From f1d15225629418675cb7c4616e19f65ac5d7355b Mon Sep 17 00:00:00 2001
From: lw520203 <1823363429@qq.com>
Date: Thu, 28 Aug 2025 20:04:19 +0800
Subject: [PATCH 7/9] xxx

---
 devstation_aarch64_rpmlist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devstation_aarch64_rpmlist b/devstation_aarch64_rpmlist
index 5bb5ec4..a356038 100644
--- a/devstation_aarch64_rpmlist
+++ b/devstation_aarch64_rpmlist
@@ -192,7 +192,7 @@ uv
 python3-mcp
 nodejs-packaging
 tigervnc
-grub2-efi-x64-modules
+grub2-efi-aa64-modules
 grub2-common
 deepchat
 dev-store
-- 
Gitee


From 79f18e510473e3f5fca01fd7ae69514b4757eb05 Mon Sep 17 00:00:00 2001
From: lw520203 <1823363429@qq.com>
Date: Thu, 28 Aug 2025 20:49:28 +0800
Subject: [PATCH 8/9] xxx

---
 0001-replace-devstation-installer-to-heolleo.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/0001-replace-devstation-installer-to-heolleo.patch b/0001-replace-devstation-installer-to-heolleo.patch
index 7c12548..3ca93ba 100644
--- a/0001-replace-devstation-installer-to-heolleo.patch
+++ b/0001-replace-devstation-installer-to-heolleo.patch
@@ -53,7 +53,7 @@ index 2bb52ac..cba3c31 100755
      sed -i 's#ROOT_PWD#'${root_pwd}'#' ${cfg_dir}/devstation_livecd_${ARCH}.ks
      sed -i 's#INSTALL_REPO#'${INSTALL_URL}'#' ${cfg_dir}/devstation_livecd_${ARCH}.ks
 -    extra_packages="calamares calamares-devel calamares-interactiveterminal calamares-libs kpmcore kpmcore-devel"
-+    extra_packages="heolleo archinstall"
++    extra_packages="heolleo"
      rpmlist="${rpmlist} ${extra_packages}"
      for rpm_name in ${rpmlist}
      do
-- 
Gitee


From 6e6aa20975f0e8e9dadc9295f826ed7dd3484721 Mon Sep 17 00:00:00 2001
From: lw520203 <1823363429@qq.com>
Date: Thu, 28 Aug 2025 20:53:36 +0800
Subject: [PATCH 9/9] xxx

---
 ...lace-devstation-installer-to-heolleo.patch | 62 -------------------
 oemaker.spec                                  |  1 -
 2 files changed, 63 deletions(-)
 delete mode 100644 0001-replace-devstation-installer-to-heolleo.patch

diff --git a/0001-replace-devstation-installer-to-heolleo.patch b/0001-replace-devstation-installer-to-heolleo.patch
deleted file mode 100644
index 3ca93ba..0000000
--- a/0001-replace-devstation-installer-to-heolleo.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From cea761dce52291f70ce84e22fdf65cde6b47be07 Mon Sep 17 00:00:00 2001
-From: lw520203 <1823363429@qq.com>
-Date: Tue, 26 Aug 2025 16:11:57 +0800
-Subject: [PATCH] replace devstation installer to heolleo
-
----
- isomaker/config/aarch64/livecd/devstation_livecd_aarch64.ks | 4 +---
- isomaker/config/x86_64/livecd/devstation_livecd_x86_64.ks   | 3 +--
- isomaker/iso.sh                                             | 2 +-
- 3 files changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/isomaker/config/aarch64/livecd/devstation_livecd_aarch64.ks b/isomaker/config/aarch64/livecd/devstation_livecd_aarch64.ks
-index be247e6..e8f3c45 100644
---- a/isomaker/config/aarch64/livecd/devstation_livecd_aarch64.ks
-+++ b/isomaker/config/aarch64/livecd/devstation_livecd_aarch64.ks
-@@ -64,13 +64,11 @@ polkit.addRule(function(action, subject) {
- });
- EOR
- 
--cp /usr/share/applications/calamares.desktop /etc/xdg/autostart/
-+cp /usr/share/applications/heolleo.desktop /etc/xdg/autostart/
- 
- systemctl enable gdm
- systemctl set-default graphical.target
- 
--systemctl enable calamares
--
- su - devstation -c gsettings set org.gnome.desktop.input-sources sources "[(xkb, us), (ibus, libpinyin)]"
- 
- touch /etc/sysconfig/network
-diff --git a/isomaker/config/x86_64/livecd/devstation_livecd_x86_64.ks b/isomaker/config/x86_64/livecd/devstation_livecd_x86_64.ks
-index 488a71c..364bfe4 100644
---- a/isomaker/config/x86_64/livecd/devstation_livecd_x86_64.ks
-+++ b/isomaker/config/x86_64/livecd/devstation_livecd_x86_64.ks
-@@ -66,10 +66,9 @@ polkit.addRule(function(action, subject) {
-     }
- });
- EOR
--cp /usr/share/applications/calamares.desktop /etc/xdg/autostart/
-+cp /usr/share/applications/heolleo.desktop /etc/xdg/autostart/
- systemctl enable gdm
- systemctl set-default graphical.target
--systemctl enable calamares
- su - devstation -c gsettings set org.gnome.desktop.input-sources sources "[('xkb', 'us'), ('ibus', 'libpinyin')]"
- 
- touch /etc/sysconfig/network
-diff --git a/isomaker/iso.sh b/isomaker/iso.sh
-index 2bb52ac..cba3c31 100755
---- a/isomaker/iso.sh
-+++ b/isomaker/iso.sh
-@@ -307,7 +307,7 @@ function gen_devstation_livecd_iso() {
-     cp config/${ARCH}/livecd/devstation_livecd_${ARCH}.ks ${cfg_dir}
-     sed -i 's#ROOT_PWD#'${root_pwd}'#' ${cfg_dir}/devstation_livecd_${ARCH}.ks
-     sed -i 's#INSTALL_REPO#'${INSTALL_URL}'#' ${cfg_dir}/devstation_livecd_${ARCH}.ks
--    extra_packages="calamares calamares-devel calamares-interactiveterminal calamares-libs kpmcore kpmcore-devel"
-+    extra_packages="heolleo"
-     rpmlist="${rpmlist} ${extra_packages}"
-     for rpm_name in ${rpmlist}
-     do
--- 
-2.43.0
-
diff --git a/oemaker.spec b/oemaker.spec
index 4cf871b..1f1e3f2 100644
--- a/oemaker.spec
+++ b/oemaker.spec
@@ -46,7 +46,6 @@ Patch0001:      0001-bugfix-IABY7K.patch
 Patch0002:      0001-fix-livecd-grub2-efi.cfg-not-found.patch
 Patch0003:      0001-Fixes-boot-failure-caused-by-invalid-volume-IDs.patch
 Patch0004:      0002-delete-package-xorg-x11-server-utils.patch
-Patch0005:      0001-replace-devstation-installer-to-heolleo.patch
 
 %description
 a building tool for DVD ISO making and ISO cutting
-- 
Gitee