From f4f60e36341a56c15da5a153d768e31fba4e59b1 Mon Sep 17 00:00:00 2001 From: dfan Date: Fri, 4 Oct 2024 17:06:38 +0100 Subject: [PATCH] Revert "gcc-toolset-12 package is retired on branch c10s for CS-2551" This reverts commit e09a9ca96d4f1453110578d1de1458ad68202b37. --- .gitignore | 2 + README.md | 3 - dead.package | 1 - gating.yaml | 6 + gcc-toolset-12.spec | 193 +++++++++++++++++++++++++++++++++ sources | 2 + tests/gts-smoketest/PURPOSE | 3 + tests/gts-smoketest/runtest.sh | 10 ++ tests/tests.yml | 10 ++ 9 files changed, 226 insertions(+), 4 deletions(-) create mode 100644 .gitignore delete mode 100644 README.md delete mode 100644 dead.package create mode 100644 gating.yaml create mode 100644 gcc-toolset-12.spec create mode 100644 sources create mode 100644 tests/gts-smoketest/PURPOSE create mode 100755 tests/gts-smoketest/runtest.sh create mode 100644 tests/tests.yml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0672635 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/README +/sudo.sh diff --git a/README.md b/README.md deleted file mode 100644 index 24b9ea2..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Package Not Available -This package is not available on CentOS Stream 10. -It may be available on another branch. \ No newline at end of file diff --git a/dead.package b/dead.package deleted file mode 100644 index ac72e3e..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -gcc-toolset-12 package is retired on branch c10s for CS-2551 \ No newline at end of file diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..6985029 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,6 @@ +--- !Policy +product_versions: + - rhel-8 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/gcc-toolset-12.spec b/gcc-toolset-12.spec new file mode 100644 index 0000000..adf0d40 --- /dev/null +++ b/gcc-toolset-12.spec @@ -0,0 +1,193 @@ +%global __python /usr/bin/python3 +%global scl gcc-toolset-12 +%scl_package %scl + +Summary: Package that installs %scl +Name: %scl_name +Version: 12.0 +Release: 5%{?dist} +License: GPLv2+ +Group: Applications/File +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: README +Source1: sudo.sh + +Requires: %{scl_prefix}runtime +Requires: %{scl_prefix}gcc %{scl_prefix}gcc-c++ %{scl_prefix}gcc-gfortran +Requires: %{scl_prefix}binutils +Requires: %{scl_prefix}gdb +Requires: %{scl_prefix}dwz +Requires: %{scl_prefix}annobin-plugin-gcc +Obsoletes: %{name} < %{version}-%{release} +Obsoletes: %{scl_prefix}dockerfiles < %{version}-%{release} + +BuildRequires: scl-utils-build >= 20120927-11 +BuildRequires: iso-codes +BuildRequires: help2man +%if 0%{?rhel} >= 8 +BuildRequires: python3-devel +%endif + +%description +This is the main package for %scl Software Collection. + +%package runtime +Summary: Package that handles %scl Software Collection. +Group: Applications/File +Requires: scl-utils >= 20120927-11 +Obsoletes: %{name}-runtime < %{version}-%{release} +%if 0%{?rhel} >= 7 +Requires(post): %{_root_sbindir}/semanage %{_root_sbindir}/restorecon +Requires(postun): %{_root_sbindir}/semanage %{_root_sbindir}/restorecon +%else +Requires(post): libselinux policycoreutils-python +Requires(postun): libselinux policycoreutils-python +%endif + +%description runtime +Package shipping essential scripts to work with %scl Software Collection. + +%package build +Summary: Package shipping basic build configuration +Group: Applications/File +Requires: %{scl_prefix}runtime +Requires: scl-utils-build >= 20120927-11 +Obsoletes: %{name}-build < %{version}-%{release} + +%description build +Package shipping essential configuration macros to build %scl Software Collection. + +%prep +%setup -c -T + +# This section generates README file from a template and creates man page +# from that file, expanding RPM macros in the template file. +cat <<'EOF' | tee README +%{expand:%(cat %{SOURCE0})} +EOF + +%build + +# Temporary helper script used by help2man. +cat <<\EOF | tee h2m_helper +#!/bin/sh +if [ "$1" = "--version" ]; then + printf '%%s' "%{?scl_name} %{version} Software Collection" +else + cat README +fi +EOF +chmod a+x h2m_helper +# Generate the man page. +help2man -N --section 7 ./h2m_helper -o %{?scl_name}.7 + +# Enable collection script +# ======================== +cat <enable +# General environment variables +export PATH=%{_bindir}\${PATH:+:\${PATH}} +export MANPATH=%{_mandir}\${MANPATH:+:\${MANPATH}} +export INFOPATH=%{_infodir}\${INFOPATH:+:\${INFOPATH}} +# ??? We probably don't need this anymore. +export PCP_DIR=%{_scl_root} +# bz847911 workaround: +# we need to evaluate rpm's installed run-time % { _libdir }, not rpmbuild time +# or else /etc/ld.so.conf.d files? +rpmlibdir=\$(rpm --eval "%%{_libdir}") +# bz1017604: On 64-bit hosts, we should include also the 32-bit library path. +# bz1873882: On 32-bit hosts, we should include also the 64-bit library path. +# bz2027377: Avoid unbound variables +if [ "\$rpmlibdir" != "\${rpmlibdir/lib64/}" ]; then + rpmlibdir32=":%{_scl_root}\${rpmlibdir/lib64/lib}" + rpmlibdir64= +else + rpmlibdir64=":%{_scl_root}\${rpmlibdir/lib/lib64}" + rpmlibdir32= +fi +# Prepend the usual /opt/.../usr/lib{64,}. +export LD_LIBRARY_PATH=%{_scl_root}\$rpmlibdir\$rpmlibdir64\$rpmlibdir32\${LD_LIBRARY_PATH:+:\${LD_LIBRARY_PATH}} +export PKG_CONFIG_PATH=%{_libdir}/pkgconfig\${PKG_CONFIG_PATH:+:\${PKG_CONFIG_PATH}} +EOF + +# Sudo script +# =========== +cat <<'EOF' > sudo +%{expand:%(cat %{SOURCE1})} +EOF + +%install +(%{scl_install}) + +# This allows users to build packages using DTS/GTS. +cat >> %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-enable << EOF +%%enable_devtoolset12 %%global ___build_pre %%{___build_pre}; source scl_source enable %{scl} || : +EOF + +mkdir -p %{buildroot}%{_scl_root}/etc/alternatives %{buildroot}%{_scl_root}/var/lib/alternatives + +install -d -m 755 %{buildroot}%{_scl_scripts} +install -p -m 755 enable %{buildroot}%{_scl_scripts}/ + +install -d -m 755 %{buildroot}%{_scl_scripts} +install -p -m 755 sudo %{buildroot}%{_bindir}/ + +# Other directories that should be owned by the runtime +install -d -m 755 %{buildroot}%{_datadir}/appdata +# Otherwise unowned perl directories +install -d -m 755 %{buildroot}%{_libdir}/perl5 +install -d -m 755 %{buildroot}%{_libdir}/perl5/vendor_perl +install -d -m 755 %{buildroot}%{_libdir}/perl5/vendor_perl/auto + +# Install generated man page. +install -d -m 755 %{buildroot}%{_mandir}/man7 +install -p -m 644 %{?scl_name}.7 %{buildroot}%{_mandir}/man7/ + +%files +%doc README +%{_mandir}/man7/%{?scl_name}.* + +%files runtime +%scl_files +%{_root_sysconfdir}/rpm/macros.%{scl}-enable +%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_sysconfdir}/selinux-equiv.created +%dir %{_scl_root}/etc/alternatives +%dir %{_datadir}/appdata + +%files build +%{_root_sysconfdir}/rpm/macros.%{scl}-config + +%post runtime +if [ ! -f %{_sysconfdir}/selinux-equiv.created ]; then + /usr/sbin/semanage fcontext -a -e / %{_scl_root} + restorecon -R %{_scl_root} + touch %{_sysconfdir}/selinux-equiv.created +fi + +%preun runtime +[ $1 = 0 ] && rm -f %{_sysconfdir}/selinux-equiv.created || : + +%postun runtime +if [ $1 = 0 ]; then + /usr/sbin/semanage fcontext -d %{_scl_root} + [ -d %{_scl_root} ] && restorecon -R %{_scl_root} || : +fi + +%changelog +* Wed Jun 29 2022 Marek Polacek - 12.0-5 +- require -annobin-plugin-gcc (#2102356) + +* Mon Jun 13 2022 Marek Polacek - 12.0-4 +- NVR bump and rebuild + +* Fri May 27 2022 Marek Polacek - 12.0-3 +- use rpm/macros.%{scl}-enable for %enable_devtoolset12 and put it in + the -runtime subpackage (#2009528) + +* Fri May 27 2022 Marek Polacek - 12.0-2 +- cut down the required packages, remove -toolchain and -perftools + +* Mon May 16 2022 Martin Cermak - 12.0-1 +- NVR bump and rebuild, introduce CI gating setup + +* Tue May 10 2022 Marek Polacek - 12.0-0 +- new package (#2077277) diff --git a/sources b/sources new file mode 100644 index 0000000..422d245 --- /dev/null +++ b/sources @@ -0,0 +1,2 @@ +SHA512 (README) = 81f0ee6593eea57c5eae4e27cf559fa7ac3968806ee1449e2959a0586d189070f337696a241100e0722f58465e740d2f0b8901f0749bf8bf1b7b82aa46fd03f1 +SHA512 (sudo.sh) = 1378412b39b31f1f76b9d7b9fce5ea679e764a2fd85804fbc3b9ce1c8b5e9b1694be854b4407d1b5dba229763127c9cc64bc09bdf87b384c93536b97d001520d diff --git a/tests/gts-smoketest/PURPOSE b/tests/gts-smoketest/PURPOSE new file mode 100644 index 0000000..bdf2003 --- /dev/null +++ b/tests/gts-smoketest/PURPOSE @@ -0,0 +1,3 @@ +Test Name: gts-smoketest +Author: +Short Description: Check the metapackage installability diff --git a/tests/gts-smoketest/runtest.sh b/tests/gts-smoketest/runtest.sh new file mode 100755 index 0000000..926435f --- /dev/null +++ b/tests/gts-smoketest/runtest.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e +set -x + +# This is a metapackage. It's main purpose is to pull other packages +# into play via the rpm deps. +rpm -q gcc-toolset-12 +echo +echo RESULT: PASS diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..9dc0e12 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,10 @@ +--- +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + tests: + - gts-smoketest + required_packages: + - scl-utils