From a82424894b544070730cee991a89c74a3dc21ef6 Mon Sep 17 00:00:00 2001 From: lizixin <2271170409@qq.com> Date: Mon, 17 Mar 2025 19:22:05 +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=EF=BC=8C=E4=BF=AE=E5=A4=8DAMD=20wifi?= =?UTF-8?q?=20mod=E5=90=AF=E5=8A=A8=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 0022-update-AMD-module-dependency.patch | 29 +++++++++++++++++++++++++ calamares.spec | 6 ++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0022-update-AMD-module-dependency.patch diff --git a/0022-update-AMD-module-dependency.patch b/0022-update-AMD-module-dependency.patch new file mode 100644 index 0000000..06fa05f --- /dev/null +++ b/0022-update-AMD-module-dependency.patch @@ -0,0 +1,29 @@ +From 60936d644d8f3e372e77667b25919e8a40819d71 Mon Sep 17 00:00:00 2001 +From: lizixin <2271170409@qq.com> +Date: Mon, 17 Mar 2025 19:16:32 +0800 +Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=84=9A=E6=9C=AC=E6=9B=B4?= + =?UTF-8?q?=E6=96=B0module=E6=A8=A1=E5=9D=97=E4=BE=9D=E8=B5=96?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + src/modules/packages/main.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py +index 2c6e6adb4..a02b5998f 100644 +--- a/src/modules/packages/main.py ++++ b/src/modules/packages/main.py +@@ -766,7 +766,7 @@ def handle_packagechooser(): + """ + 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 5c82d3e..8b9a7ea 100644 --- a/calamares.spec +++ b/calamares.spec @@ -2,7 +2,7 @@ Name: calamares Version: 3.3.7 -Release: 11 +Release: 12 Summary: Installer from a live CD/DVD/USB to disk License: GPL-3.0-or-later @@ -63,6 +63,7 @@ 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 +Patch21: 0022-update-AMD-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 @@ -355,6 +356,9 @@ cd %{_builddir} || exit 0 rm -rf %{buildroot} %changelog +* Mon Mar 17 2025 Li Zixin <2271170409@qq.com> - 3.3.7-12 +- Add update module dependency scripy + * Fri Mar 14 2025 Liu Wang <1823363429@qq.com> - 3.3.7-11 - Fix aarch64 desktop start up failed issue -- Gitee