From 2a7fb8a200b11b6bc3b8d963b4dc0da531f55fec Mon Sep 17 00:00:00 2001 From: sun_hai_10 Date: Sun, 26 Jan 2025 14:42:03 +0800 Subject: [PATCH] sync changes from 2403 sp1 --- anaconda.spec | 75 +++++++++++++++++-- ...ort-Fix-wrong-dracut-timeout-message.patch | 44 +++++++++++ ...re-only-append-fanalyzer-when-buildi.patch | 54 +++++++++++++ ...y-of-network-configuration-interface.patch | 25 +++++++ ...nge-root-and-storage-interface-shows.patch | 2 +- ...up-mode-of-do_transaction-sub-proces.patch | 2 +- ...D-accelerator-on-root-account-screen.patch | 25 +++++++ ...ity-with-LIBGL_KOPPER_DISABLE-as-yes.patch | 24 ++++++ 8 files changed, 242 insertions(+), 9 deletions(-) create mode 100644 backport-Fix-wrong-dracut-timeout-message.patch create mode 100644 backport-configure-only-append-fanalyzer-when-buildi.patch create mode 100644 bugfix-Fix-abnormal-display-of-network-configuration-interface.patch create mode 100644 bugfix-fix-duplicate-alt-D-accelerator-on-root-account-screen.patch create mode 100644 bugfix-set-metacity-with-LIBGL_KOPPER_DISABLE-as-yes.patch diff --git a/anaconda.spec b/anaconda.spec index fddb648..5155c40 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,6 +1,6 @@ Name: anaconda Version: 36.16.5 -Release: 39 +Release: 47 Summary: Graphical system installer License: GPL-2.0-or-later and MIT URL: https://fedoraproject.org/wiki/Anaconda @@ -20,7 +20,6 @@ Patch9001: bugfix-GUI-nfs-unknown-error.patch Patch9002: bugfix-set-up-LD_PRELOAD-for-the-Storage-and-Services-module.patch Patch9003: bugfix-Solve-the-problem-that-the-circular-loading-progress-bar-does-not-rotate.patch Patch9004: change-inst-repo-default-value.patch -Patch9005: disable-disk-encryption.patch Patch9006: disable-ssh-login-checkbox.patch Patch9007: fix-hostname-info.patch Patch9008: hide-help-button.patch @@ -53,6 +52,8 @@ Patch6009: backport-Fix-the-systemd-generator-for-systemd-253-2165433.patch Patch6010: backport-a-riscv64-enablement-patch-from-upstream.patch # https://github.com/rhinstaller/anaconda/pull/3984 Patch6011: backport-Don-t-unnecessarily-use-cat-and-use-grep-E.patch +# https://github.com/rhinstaller/anaconda/pull/5884 +Patch6012: backport-configure-only-append-fanalyzer-when-buildi.patch Patch9023: bugfix-change-root-and-storage-interface-shows.patch Patch9024: bugfix-revert-Set-default-entry-to-the-BLS-id-instead-of-the-entry-index.patch @@ -63,6 +64,15 @@ Patch10000: 0001-add-loongarch-support-for-anaconda.patch # https://github.com/rhinstaller/anaconda/pull/4235 Patch10001: 0001-check-that-the-password-contains-the-username.patch +%if ! 0%{?openEuler} +Patch9027: disable-disk-encryption.patch +%endif + +Patch9028: bugfix-set-metacity-with-LIBGL_KOPPER_DISABLE-as-yes.patch +Patch9029: bugfix-Fix-abnormal-display-of-network-configuration-interface.patch +Patch9030: bugfix-fix-duplicate-alt-D-accelerator-on-root-account-screen.patch + +Patch9031: backport-Fix-wrong-dracut-timeout-message.patch %define dasbusver 1.3 %define dbusver 1.2.3 @@ -189,6 +199,8 @@ runtime on NFS/HTTP/FTP servers or local disks. %{?_ld_as_needed: /usr/lib/rpm/fix-libtool-from-moving-options-after-libs `pwd`/widgets} %build +rm -rvf ./configure +autoreconf -f -i -v # use actual build-time release number, not tarball creation time release number %if "%toolchain" == "clang" %configure ANACONDA_RELEASE=%{release} CC=clang @@ -215,10 +227,10 @@ sed -i "/^additional_arguments =*/ s/$/ crashkernel=512M/" %{SOURCE5} %endif %ifarch aarch64 -sed -i "/^additional_arguments =*/ s/$/ crashkernel=1024M,high smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15/" %{SOURCE1} -sed -i "/^additional_arguments =*/ s/$/ panic=1 vga=0x317 nohz=off smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15/" %{SOURCE2} -sed -i "/^additional_arguments =*/ s/$/ panic=1 vga=0x317 nohz=off smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15/" %{SOURCE3} -sed -i "/^additional_arguments =*/ s/$/ crashkernel=1024M,high smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15/" %{SOURCE5} +sed -i "/^additional_arguments =*/ s/$/ crashkernel=1024M,high smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 arm64.nopauth/" %{SOURCE1} +sed -i "/^additional_arguments =*/ s/$/ panic=1 vga=0x317 nohz=off smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 arm64.nopauth/" %{SOURCE2} +sed -i "/^additional_arguments =*/ s/$/ panic=1 vga=0x317 nohz=off smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 arm64.nopauth/" %{SOURCE3} +sed -i "/^additional_arguments =*/ s/$/ crashkernel=1024M,high smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 arm64.nopauth/" %{SOURCE5} %endif install -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/%{name}/profile.d/ install -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}/profile.d/ @@ -320,12 +332,61 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog -* Fri Jan 24 2025 Funda Wang - 36.16.5-39 +* Fri Jan 24 2025 Funda Wang - 36.16.5-47 - Type:bugfix - ID:NA - SUG:NA - DESC: explicitly specify PYTHONSAFEPATH when installing +* Thu Jan 16 2025 sunhai - 36.16.5-46 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: Fix wrong dracut timeout message + +* Thu Dec 05 2024 majianhan - 36.16.5-45 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: Fix duplicate alt-D accelerator on root account screen + +* Wed Dec 05 2024 sunhai - 36.16.5-44 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: skip non-exitent packages continue the installion + +* Mon Nov 25 2024 shenzhongwei - 36.16.5-43 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: Fix abnormal display of network configuration interface + +* Sat Nov 23 2024 sunhai - 36.16.5-42 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: set metacity with LIBGL_KOPPER_DISABLE as yes + +* Fri Sep 20 2024 jchzhou - 36.16.5-41 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: backport & adjust upstream patch for fixing building issues with clang +- run autoreconf before building + +* Tue Nov 12 2024 zhangpeng - 36.16.5-40 +- Type:performance +- ID:NA +- SUG:NA +- DESC: disable arm64 PAC feature + +* Tue Nov 12 2024 sunhai - 36.16.5-39 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: enable disk encryption + * Tue Aug 20 2024 songmingliang - 36.16.5-38 - Type:bugfix - ID:NA diff --git a/backport-Fix-wrong-dracut-timeout-message.patch b/backport-Fix-wrong-dracut-timeout-message.patch new file mode 100644 index 0000000..626688c --- /dev/null +++ b/backport-Fix-wrong-dracut-timeout-message.patch @@ -0,0 +1,44 @@ +From 87780c8ba530f10cc4e489c387fc34084f98afee Mon Sep 17 00:00:00 2001 +From: Jiri Konecny +Date: Fri, 31 Mar 2023 10:20:27 +0200 +Subject: [PATCH] Fix wrong dracut timeout message + +We added Anaconda error reporting when Dracut timeout during boot. If +the reason is known issue we will print that to a user. However, in case +it is not known the code failed with message: + +... /run/anaconda/initrd_errors.txt: No such file or directory + +To fix this just print "Reason unknown" and not execute rest of the +code. + +Reference:https://github.com/rhinstaller/anaconda/commit/87780c8ba530f10cc4e489c387fc34084f98afee +Conflict:NA +--- + dracut/anaconda-error-reporting.sh | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/dracut/anaconda-error-reporting.sh b/dracut/anaconda-error-reporting.sh +index c9cca5cea2e..b410cd667e5 100755 +--- a/dracut/anaconda-error-reporting.sh ++++ b/dracut/anaconda-error-reporting.sh +@@ -14,9 +14,13 @@ warn "Please also note that the 'inst.' prefix is now mandatory." + warn "# #" + warn "#### Installer errors encountered during boot: ####" + warn "# #" +-while read -r line; do +- warn "$line" +-done < /run/anaconda/initrd_errors.txt ++if ! [ -e /run/anaconda/initrd_errors.txt ]; then ++ warn "Reason unknown" ++else ++ while read -r line; do ++ warn "$line" ++ done < /run/anaconda/initrd_errors.txt ++fi + warn "# #" + warn "############# Anaconda installer errors end ###############" + +-- +2.43.0 + diff --git a/backport-configure-only-append-fanalyzer-when-buildi.patch b/backport-configure-only-append-fanalyzer-when-buildi.patch new file mode 100644 index 0000000..f9f3099 --- /dev/null +++ b/backport-configure-only-append-fanalyzer-when-buildi.patch @@ -0,0 +1,54 @@ +From 0cdaa2229fd4855ee61f68cd7f7172f585fb4572 Mon Sep 17 00:00:00 2001 +From: jchzhou +Date: Thu, 19 Sep 2024 18:16:30 +0800 +Subject: [PATCH] configure: only append -fanalyzer when building with gcc + +Anaconda fails to build with clang as the compiler doesn't recognize -fanalyzer +introduced experimentally in #3482 for supplementing cppcheck. Only append that +when building with gcc instead. + +Signed-off-by: jchzhou +--- + configure | 6 +++++- + configure.ac | 7 ++++++- + 2 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 05e4a1d..53c8ec8 100755 +--- a/configure ++++ b/configure +@@ -15536,8 +15536,12 @@ fi + SHUT_UP_GCC="-Wno-unused-result" + + # Add remaining compiler flags we want to use +-CFLAGS="$CFLAGS -Wall -Werror $SHUT_UP_GCC -fanalyzer" ++# only append -fanalyzer when building with gcc ++CFLAGS="$CFLAGS -Wall -Werror $SHUT_UP_GCC" + ++if [[ "$CC" == "gcc" ]]; then ++ CFLAGS="$CFLAGS -fanalyzer" ++fi + + # Perform arch related tests + +diff --git a/configure.ac b/configure.ac +index 42cdae6..e515488 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -97,7 +97,12 @@ ANACONDA_PKG_CHECK_MODULES([LIBARCHIVE], [libarchive >= 3.0.4]) + SHUT_UP_GCC="-Wno-unused-result" + + # Add remaining compiler flags we want to use +-CFLAGS="$CFLAGS -Wall -Werror $SHUT_UP_GCC -fanalyzer" ++# only append -fanalyzer when building with gcc ++CFLAGS="$CFLAGS -Wall -Werror $SHUT_UP_GCC" ++ ++if [[ "$CC" == "gcc" ]]; then ++ CFLAGS="$CFLAGS -fanalyzer" ++fi + + + # Perform arch related tests +-- +2.46.1 + diff --git a/bugfix-Fix-abnormal-display-of-network-configuration-interface.patch b/bugfix-Fix-abnormal-display-of-network-configuration-interface.patch new file mode 100644 index 0000000..336de57 --- /dev/null +++ b/bugfix-Fix-abnormal-display-of-network-configuration-interface.patch @@ -0,0 +1,25 @@ +From 4d58c41562052f4658deaabe45cb2d5b4010613f Mon Sep 17 00:00:00 2001 +From: shenzhongwei +Date: Tue, 5 Nov 2024 15:06:29 +0800 +Subject: [PATCH] Fix abnormal display of network configuration interface + +--- + po/zh_CN.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/po/zh_CN.po b/po/zh_CN.po +index 630a6bf..7a73893 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -6243,7 +6243,7 @@ msgstr "我们需要访问网络来获取有关您位置的信息，并向您提 + #: pyanaconda/ui/gui/spokes/network.glade:449 + #: pyanaconda/ui/gui/spokes/network.glade:2587 + msgid "NETWORK & HOST NAME" +-msgstr "网络和主机名(_N)" ++msgstr "网络和主机名" + + #: pyanaconda/ui/gui/spokes/network.glade:488 + msgid "" +-- +2.27.0 + diff --git a/bugfix-change-root-and-storage-interface-shows.patch b/bugfix-change-root-and-storage-interface-shows.patch index 00cc6be..09eba94 100644 --- a/bugfix-change-root-and-storage-interface-shows.patch +++ b/bugfix-change-root-and-storage-interface-shows.patch @@ -113,8 +113,8 @@ index 3a75565..b9344da 100644 --- a/pyanaconda/ui/gui/spokes/lib/accordion.py +++ b/pyanaconda/ui/gui/spokes/lib/accordion.py @@ -544,7 +544,7 @@ class CreateNewPage(BasePage): - use_underline=True ) + self._createBox.attach(label, 0, 6, 2, 1) - checkbox = Gtk.CheckButton(label="Encrypt my data.") + checkbox = Gtk.CheckButton(label=_("Encrypt my data.")) diff --git a/bugfix-change-the-startup-mode-of-do_transaction-sub-proces.patch b/bugfix-change-the-startup-mode-of-do_transaction-sub-proces.patch index cefc6ea..f94151e 100644 --- a/bugfix-change-the-startup-mode-of-do_transaction-sub-proces.patch +++ b/bugfix-change-the-startup-mode-of-do_transaction-sub-proces.patch @@ -111,7 +111,7 @@ index b1f452c..c73f3d9 100644 + g_include_list, + g_exclude_list, + self._ignore_broken_packages, -+ self._ignore_missing_packages)) ++ True)) # Start the transaction. log.debug("Starting the transaction process...") diff --git a/bugfix-fix-duplicate-alt-D-accelerator-on-root-account-screen.patch b/bugfix-fix-duplicate-alt-D-accelerator-on-root-account-screen.patch new file mode 100644 index 0000000..7ca269a --- /dev/null +++ b/bugfix-fix-duplicate-alt-D-accelerator-on-root-account-screen.patch @@ -0,0 +1,25 @@ +From 92bb076a9f9e5bdfb8d1c2691ef6009bba4fbbe4 Mon Sep 17 00:00:00 2001 +From: majianhan +Date: Mon, 25 Nov 2024 11:12:04 +0800 +Subject: [PATCH] Fix duplicate alt-D accelerator on root account screen + +--- + pyanaconda/ui/gui/spokes/root_password.glade | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyanaconda/ui/gui/spokes/root_password.glade b/pyanaconda/ui/gui/spokes/root_password.glade +index 53bc90c..e90f301 100644 +--- a/pyanaconda/ui/gui/spokes/root_password.glade ++++ b/pyanaconda/ui/gui/spokes/root_password.glade +@@ -94,7 +94,7 @@ The root user (also known as super user) has complete access to the entire syste + + True + False +- _Disable root account ++ D_isable root account + True + 0 + disable_root_radio +-- +2.43.0 + diff --git a/bugfix-set-metacity-with-LIBGL_KOPPER_DISABLE-as-yes.patch b/bugfix-set-metacity-with-LIBGL_KOPPER_DISABLE-as-yes.patch new file mode 100644 index 0000000..2e19591 --- /dev/null +++ b/bugfix-set-metacity-with-LIBGL_KOPPER_DISABLE-as-yes.patch @@ -0,0 +1,24 @@ +From cfe105b748c5e4a7655ebd71555d23e769470161 Mon Sep 17 00:00:00 2001 +From: sunhai +Date: Sat, 23 Nov 2024 16:06:08 +0800 +Subject: [PATCH] set metacity with LIBGL_KOPPER_DISABLE as yes + +--- + pyanaconda/display.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/pyanaconda/display.py b/pyanaconda/display.py +index ed163e7..8de49a4 100644 +--- a/pyanaconda/display.py ++++ b/pyanaconda/display.py +@@ -197,6 +197,7 @@ def do_startup_x11_actions(): + # to set GUI subprocess SIGINT handler + signal.signal(signal.SIGINT, signal.SIG_IGN) + ++ os.environ["LIBGL_KOPPER_DISABLE"] = "yes" + childproc = util.startProgram(["metacity", "--display", ":1", "--sm-disable"], + env_add={'XDG_DATA_DIRS': xdg_data_dirs}, + preexec_fn=x11_preexec) +-- +2.33.0 + -- Gitee