rpms/glibc
7
0
Fork 1
Code Issues Pull Requests Releases Activity

glibc.spec: Depend only on RPM 4.14 features.

Browse Source 
Downstream distro boostrap based on EL8-style servers may not
yet be able to deploy RPM 4.15 features. Ease the transition
burden for now by avoiding RPM 4.15 features.

Resolves: RHEL-19045
This commit is contained in:
Carlos O'Donell 2023-12-13 17:29:18 -05:00
parent 37a93f1685
commit 259d575cdf
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
glibc.spec
View File

@ -119,12 +119,26 @@
-- https://github.com/projectatomic/rpm-ostree/pull/1869 -- https://github.com/projectatomic/rpm-ostree/pull/1869
-- If we add new lua actions to the %%post code we should coordinate -- If we add new lua actions to the %%post code we should coordinate
-- with rpm-ostree and ensure that their glibc install is functional. -- with rpm-ostree and ensure that their glibc install is functional.
-- -- We must not use rpm.execute because this is a RPM 4.15 features and
-- we must still support downstream bootstrap with RPM 4.14 and missing
-- containerized boostrap.
-- Open-code rpm.execute with error message handling.
function post_exec (msg, program, ...)
local pid = posix.fork ()
if pid == 0 then
posix.exec (program, ...)
io.stdout:write (msg)
assert (nil)
elseif pid > 0 then
posix.wait (pid)
end
end
-- Note: We use _prefix because Fedora's UsrMove says so. -- Note: We use _prefix because Fedora's UsrMove says so.
function call_ldconfig () function call_ldconfig ()
if not rpm.execute("%{_prefix}/sbin/ldconfig") then post_exec("Error: call to %{_prefix}/sbin/ldconfig failed.\n",
io.stdout:write ("Error: call to %{_prefix}/sbin/ldconfig failed.\n") "%{_prefix}/sbin/ldconfig")
end
end end
function update_gconv_modules_cache () function update_gconv_modules_cache ()
@ -133,13 +147,11 @@ function update_gconv_modules_cache ()
local iconv_modules = iconv_dir .. "/gconv-modules" local iconv_modules = iconv_dir .. "/gconv-modules"
if posix.utime(iconv_modules) == 0 then if posix.utime(iconv_modules) == 0 then
if posix.utime (iconv_cache) == 0 then if posix.utime (iconv_cache) == 0 then
if not rpm.execute("%{_prefix}/sbin/iconvconfig", post_exec ("Error: call to %{_prefix}/sbin/iconvconfig failed.\n",
"-o", iconv_cache, "%{_prefix}/sbin/iconvconfig",
"--nostdlib", "-o", iconv_cache,
iconv_dir) "--nostdlib",
then iconv_dir)
io.stdout:write ("Error: call to %{_prefix}/sbin/iconvconfig failed.\n")
end
else else
io.stdout:write ("Error: Missing " .. iconv_cache .. " file.\n") io.stdout:write ("Error: Missing " .. iconv_cache .. " file.\n")
end end
@ -159,7 +171,7 @@ Version: %{glibcversion}
# - It allows using the Release number without the %%dist tag in the dependency # - It allows using the Release number without the %%dist tag in the dependency
# generator to make the generated requires interchangeable between Rawhide # generator to make the generated requires interchangeable between Rawhide
# and ELN (.elnYY < .fcXX). # and ELN (.elnYY < .fcXX).
%global baserelease 27 %global baserelease 28
Release: %{baserelease}%{?dist} Release: %{baserelease}%{?dist}
# In general, GPLv2+ is used by programs, LGPLv2+ is used for # In general, GPLv2+ is used by programs, LGPLv2+ is used for
@ -2200,6 +2212,9 @@ update_gconv_modules_cache ()
%files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
%changelog %changelog
* Wed Dec 13 2023 Carlos O'Donell <carlos@redhat.com> - 2.38.9000-28
- Depend only on RPM 4.14 features (RHEL-19045)
* Fri Dec 08 2023 Carlos O'Donell <carlos@redhat.com> - 2.38.9000-27 * Fri Dec 08 2023 Carlos O'Donell <carlos@redhat.com> - 2.38.9000-27
- Drop glibc-rh2248502.patch; fix applied upstream, and - Drop glibc-rh2248502.patch; fix applied upstream, and
- Auto-sync with upstream branch master, - Auto-sync with upstream branch master,