From fbcd2774c84c572fc7236bc877032148e245340d Mon Sep 17 00:00:00 2001 From: lw520203 <1823363429@qq.com> Date: Thu, 13 Mar 2025 00:22:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9B=B4=E6=96=B0module=20de?= =?UTF-8?q?pendency=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 0023-add-module-dependency.patch | 35 ++++++++++++++++++++++++++++++++ calamares.spec | 6 +++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0023-add-module-dependency.patch diff --git a/0023-add-module-dependency.patch b/0023-add-module-dependency.patch new file mode 100644 index 0000000..f86633f --- /dev/null +++ b/0023-add-module-dependency.patch @@ -0,0 +1,35 @@ +From 0f054a57ecf2f04fe72f3d481b7d8b955e00934f Mon Sep 17 00:00:00 2001 +From: lw520203 <1823363429@qq.com> +Date: Thu, 13 Mar 2025 00:14:28 +0800 +Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9B=B4=E6=96=B0module=20de?= + =?UTF-8?q?pendency=20=E7=9A=84=E8=84=9A=E6=9C=AC?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + src/modules/packages/main.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py +index 91c627a9d..b2aff1e4d 100644 +--- a/src/modules/packages/main.py ++++ b/src/modules/packages/main.py +@@ -770,12 +770,12 @@ def handle_packagechooser(): + 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"] ++ "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", "depmod"] + } + else: + item = { + "pre-script": "", +- "post-script": ["/bin/bash /etc/add_selinux_policy.sh", "systemctl enable gdm", "systemctl set-default graphical.target"] ++ "post-script": ["/bin/bash /etc/add_selinux_policy.sh", "systemctl enable gdm", "systemctl set-default graphical.target", "depmod"] + } + + return item +-- +2.46.0 + diff --git a/calamares.spec b/calamares.spec index 527df3c..36866ff 100644 --- a/calamares.spec +++ b/calamares.spec @@ -2,7 +2,7 @@ Name: calamares Version: 3.3.7 -Release: 12 +Release: 13 Summary: Installer from a live CD/DVD/USB to disk License: GPL-3.0-or-later @@ -64,6 +64,7 @@ Patch18: 0019-add-email-tool.patch Patch19: 0020-aboutPage-release-version-problem.patch Patch20: 0021-aarch64-start-desktop-failed.patch Patch21: 0022-add-gnome-user-docs-dependency.patch +Patch22: 0023-add-module-dependency.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 @@ -356,6 +357,9 @@ cd %{_builddir} || exit 0 rm -rf %{buildroot} %changelog +* Mon Mar 24 2025 Liu Wang <1823363429@qq.com> - 3.3.7-13 +- Add module dependency depmod command + * Thu Mar 20 2025 Liu Wang <1823363429@qq.com> - 3.3.7-12 - Fix gnome desktop user help center show fail issue -- Gitee