From e8ace71c206c7e75996d2b2c372e8fad950f654d Mon Sep 17 00:00:00 2001 From: Tulio Magno Quites Machado Filho Date: Mon, 12 Dec 2022 11:10:19 -0300 Subject: [PATCH] Move the removal of multilibs to %pre * Mon Dec 12 2022 Tulio Magno Quites Machado Filho - 2.34-55 - Earlier removal of alternative multilibs (#2149994) Resolves: #2149994 --- glibc.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/glibc.spec b/glibc.spec index 61b5002..c657b84 100644 --- a/glibc.spec +++ b/glibc.spec @@ -148,7 +148,7 @@ end \ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 54%{?dist} +Release: 55%{?dist} # In general, GPLv2+ is used by programs, LGPLv2+ is used for # libraries. @@ -2511,13 +2511,11 @@ if rpm.vercmp(rel, required) < 0 then error("FATAL: kernel too old", 0) end -%post -p -%glibc_post_funcs -- (1) Remove multilib libraries from previous installs. -- In order to support in-place upgrades, we must immediately remove --- obsolete platform directories after installing a new glibc +-- all platform directories before installing a new glibc -- version. RPM only deletes files removed by updates near the end --- of the transaction. If we did not remove the obsolete platform +-- of the transaction. If we did not remove all platform -- directories here, they may be preferred by the dynamic linker -- during the execution of subsequent RPM scriptlets, likely -- resulting in process startup failures. @@ -2590,7 +2588,9 @@ for _, rdir in ipairs (remove_dirs) do end end --- (2) Update /etc/ld.so.conf +%post -p +%glibc_post_funcs +-- (1) Update /etc/ld.so.conf -- Next we update /etc/ld.so.conf to ensure that it starts with -- a literal "include ld.so.conf.d/*.conf". @@ -2629,7 +2629,7 @@ if posix.access (ldsoconf) then end end --- (3) Rebuild ld.so.cache early. +-- (2) Rebuild ld.so.cache early. -- If the format of the cache changes then we need to rebuild -- the cache early to avoid any problems running binaries with -- the new glibc. @@ -2637,7 +2637,7 @@ end -- Note: We use _prefix because Fedora's UsrMove says so. post_exec ("%{_prefix}/sbin/ldconfig") --- (4) Update gconv modules cache. +-- (3) Update gconv modules cache. -- If the /usr/lib/gconv/gconv-modules.cache exists, then update it -- with the latest set of modules that were just installed. -- We assume that the cache is in _libdir/gconv and called @@ -2645,7 +2645,7 @@ post_exec ("%{_prefix}/sbin/ldconfig") update_gconv_modules_cache() --- (5) On upgrades, restart systemd if installed. "systemctl -q" does +-- (4) On upgrades, restart systemd if installed. "systemctl -q" does -- not suppress the error message (which is common in chroots), so -- open-code post_exec with standard error suppressed. if tonumber(arg[2]) >= 2 @@ -2803,6 +2803,9 @@ fi %endif %changelog +* Mon Dec 12 2022 Tulio Magno Quites Machado Filho - 2.34-55 +- Earlier removal of alternative multilibs (#2149994) + * Mon Dec 12 2022 Florian Weimer - 2.34-54 - Install kernel header files into the sysroot subpackage (#2149644)