Keep using the system alternatives for bootstrap

The bootstrap gcc-toolset-15-binutils doesn't appear to be usable since
it fails to install with the following error:

  nothing provides /opt/rh/gcc-toolset-15/root/usr/sbin/alternatives needed by gcc-toolset-15-binutils-2.44-1.el9.x86_64

Fix that by always using the system alternatives with `--altdir`.

Related: RHEL-81741
This commit is contained in:
Siddhesh Poyarekar 2025-05-07 08:44:55 -04:00 committed by Siddhesh Poyarekar
parent 38e629439a
commit dac3899fc6

View File

@ -14,7 +14,7 @@ Name: %{?scl_prefix}binutils
# The variable %%{source} (see below) should be set to indicate which of these
# origins is being used.
Version: 2.44
Release: 1%{?dist}
Release: 2%{?dist}
License: GPL-3.0-or-later AND (GPL-3.0-or-later WITH Bison-exception-2.2) AND (LGPL-2.0-or-later WITH GCC-exception-2.0) AND BSD-3-Clause AND GFDL-1.3-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.0-or-later
URL: https://sourceware.org/binutils
@ -458,14 +458,9 @@ BuildRequires: xxhash-devel
#----------------------------------------------------------------------------
%if %{bootstrapping}
%define alternatives_cmd %{_sbindir}/alternatives
%define alternatives_cmdline %{alternatives_cmd}
%else
%{?scl:Requires:%scl_runtime}
%define alternatives_cmd %{!?scl:%{_sbindir}}%{?scl:%{_root_sbindir}}/alternatives
%define alternatives_cmdline %{alternatives_cmd}%{?scl: --altdir %{_sysconfdir}/alternatives --admindir %{_scl_root}/var/lib/alternatives}
%endif
Requires(post): %{alternatives_cmd}
Requires(preun): %{alternatives_cmd}
@ -1545,5 +1540,8 @@ exit 0
#----------------------------------------------------------------------------
%changelog
* Wed May 07 2025 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.44-2
- Use system alternatives even for bootstrap.
* Wed Apr 09 2025 Nick Clifton <nickc@redhat.com> - 2.44-1
- Initial commit: Import Fedora 42 binutils to GTS-15.