From b4ec18ed852881e49211dc7d49aa705f346a9460 Mon Sep 17 00:00:00 2001
From: lw520203 <1823363429@qq.com>
Date: Fri, 7 Mar 2025 08:34:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Daarch64=E6=9C=BA=E5=99=A8?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E5=AF=86=E7=A0=81=E8=BF=9B=E4=B8=8D=E5=8E=BB?=
 =?UTF-8?q?=E6=A1=8C=E9=9D=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 0021-aarch64-start-desktop-failed.patch | 52 +++++++++++++++++++++++++
 calamares.service                       |  2 +-
 calamares.spec                          |  6 ++-
 3 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 0021-aarch64-start-desktop-failed.patch

diff --git a/0021-aarch64-start-desktop-failed.patch b/0021-aarch64-start-desktop-failed.patch
new file mode 100644
index 0000000..a2ae96f
--- /dev/null
+++ b/0021-aarch64-start-desktop-failed.patch
@@ -0,0 +1,52 @@
+From 22ee37f127f197d60ed461be5493bc1e5f139325 Mon Sep 17 00:00:00 2001
+From: lw520203 <1823363429@qq.com>
+Date: Fri, 7 Mar 2025 08:26:01 +0800
+Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9aarch64=E5=90=AF=E5=8A=A8?=
+ =?UTF-8?q?=E8=BF=9B=E5=85=A5=E6=A1=8C=E9=9D=A2=E5=A4=B1=E8=B4=A5=E9=97=AE?=
+ =?UTF-8?q?=E9=A2=98?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ src/modules/packages/main.py | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py
+index 030455cd0..91c627a9d 100644
+--- a/src/modules/packages/main.py
++++ b/src/modules/packages/main.py
+@@ -18,6 +18,7 @@ import abc
+ from string import Template
+ import subprocess
+ import os
++import platform
+ 
+ import libcalamares
+ from libcalamares.utils import check_target_env_call, target_env_call
+@@ -765,10 +766,18 @@ def handle_packagechooser():
+     :param entry: dict
+         The operation entry to process.
+     """
+-    item = {
+-        "pre-script": "",
+-        "post-script": ["/bin/bash /etc/add_selinux_policy.sh", "systemctl enable gdm", "systemctl set-default graphical.target"]
+-    }
++    cpu_type = platform.machine()
++    if cpu_type == "aarch64":
++        item = {
++            "pre-script": "",
++            "post-script": ["/bin/bash /etc/add_selinux_policy.sh", "systemctl enable gdm", "systemctl set-default graphical.target", "/usr/bin/chcon -t bin_t /etc/gdm/PreSession/Default"]
++        }
++    else:
++       item = {
++            "pre-script": "",
++            "post-script": ["/bin/bash /etc/add_selinux_policy.sh", "systemctl enable gdm", "systemctl set-default graphical.target"]
++        }
++
+     return item
+ 
+ 
+-- 
+2.46.0
+
diff --git a/calamares.service b/calamares.service
index 66d648c..c7f5ce1 100644
--- a/calamares.service
+++ b/calamares.service
@@ -7,7 +7,7 @@ After=basic.target
 Type=simple
 ExecStartPre=/sbin/multipath -F
 ExecStartPre=/usr/sbin/partprobe
-ExecStart=/usr/bin/calamares -style Adwaita
+ExecStart=/usr/bin/echo "DevStation System Installer"
 Restart=on-abort
 
 [Install]
diff --git a/calamares.spec b/calamares.spec
index 3a06316..5c82d3e 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -2,7 +2,7 @@
 
 Name:           calamares
 Version:        3.3.7
-Release:        10
+Release:        11
 Summary:        Installer from a live CD/DVD/USB to disk
 
 License:        GPL-3.0-or-later
@@ -62,6 +62,7 @@ Patch16:        0017-Devstation-25.03-fix-timezoneErrors.patch
 Patch17:        0018-fix-desktop-icon-show.patch
 Patch18:        0019-add-email-tool.patch
 Patch19:        0020-aboutPage-release-version-problem.patch
+Patch20:        0021-aarch64-start-desktop-failed.patch
 
 # Calamares is only supported where live images (and GRUB) are. (#1171380)
 # This list matches the arches where grub2-efi is used to boot the system
@@ -354,6 +355,9 @@ cd %{_builddir} || exit 0
 rm -rf %{buildroot}
 
 %changelog
+* Fri Mar 14 2025 Liu Wang <1823363429@qq.com> - 3.3.7-11
+- Fix aarch64 desktop start up failed issue
+ 
 * Thu Mar 13 2025 Li Zixin <2271170409@qq.com> - 3.3.7-10
 - fix aboutPage release version problem
 
-- 
Gitee