Merge branch 'c8' into a8

SOURCES/dist.sh

@@ -25,7 +25,7 @@ function check_rhl {
 }
 
 function check_rhel {
-    egrep -q "(Enterprise|Advanced)" $RELEASEFILE && echo $DISTNUM
+    egrep -q "(Enterprise|Advanced|AlmaLinux)" $RELEASEFILE && echo $DISTNUM
 }
 
 function check_fedora {

SOURCES/redhat-annobin-plugin-select.sh

@@ -1,199 +0,0 @@
-#!/usr/bin/sh
-# This is a script to select which GCC spec file fragment
-# should be the destination of the redhat-annobin-cc1 symlink.
-
-# Author: Nick Clifton  <nickc@redhat.com>
-# Copyright (c) 2021 Red Hat.
-#
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published
-# by the Free Software Foundation; either version 2, or (at your
-# option) any later version.
-
-# It is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# Usage:
-#   redhat-annobin-plugin-select [script-dir]
-#
-# If script-dir is not provided then /usr/lib/rpm/redhat is used
-# as the location where all of the annobin plugin selection files
-# can be found.
-
-if test "x$1" = "x" ;
-then
-    rrcdir=/usr/lib/rpm/redhat
-else
-    rrcdir=$1
-fi
-
-# Set this variable to non-zero to enable the generation of debugging
-# messages.
-debug=0
-
-# Decide which version of the annobin plugin for gcc should be used.
-# There are two possible versions, one created by the annobin package and one
-# created by the gcc package.  The logic selects the gcc version unless both
-# have been built by the same version of the compiler.  In that case the
-# annobin version is selected instead.
-#
-# The point of all this is that the annobin plugin is very sensitive to
-# mismatches with the version of gcc that built it.  If the plugin is built
-# by version A of gcc, but then run on version B of gcc, it is possible for
-# the plugin to misbehave, which then causes problems if gating tests examine
-# the plugin's output.  (This has happened more than once in RHEL...).
-#
-# So the plugin is built both by gcc and by the annobin package.  This means
-# that whenever gcc is updated a fresh plugin is built, and the logic below
-# will select that version.  But in order to allow annobin development to
-# proceed independtently of gcc, the annobin package can also update its
-# version of the plugin, and the logic will select this new version.
-
-# This is where the annobin package stores the information on the version
-# of gcc that built the annobin plugin.
-aver=`gcc --print-file-name=plugin`/annobin-plugin-version-info
-
-# This is where the gcc package stores its version information.
-gver=`gcc --print-file-name=rpmver`
-
-aplugin=`gcc --print-file-name=plugin`/annobin.so.0.0.0
-gplugin=`gcc --print-file-name=plugin`/gcc-annobin.so.0.0.0
-
-# This is the file that needs to be updated when either of those version
-# files changes.
-rac1=redhat-annobin-cc1
-
-# This is the GCC spec file fragment that selects the gcc-built version of
-# the annobin plugin
-select_gcc=redhat-annobin-select-gcc-built-plugin
-
-# This is the GCC spec file fragment that selects the annobin-built version
-# of the annobin plugin
-select_annobin=redhat-annobin-select-annobin-built-plugin
-
-install_annobin_version=0
-install_gcc_version=0
-
-if [ -f $aplugin ]
-then
-    if [ -f $gplugin ]
-    then
-	if [ $debug -eq 1 ]
-	then
-	    echo "  redhat-rpm-config: Both plugins exist, checking version information"
-	fi
-
-	if [ -f $gver ]
-	then
-	    if [ -f $aver ]
-	    then
-		if [ $debug -eq 1 ]
-		then
-		    echo "  redhat-rpm-config: Both plugin version files exist - comparing..."
-		fi
-
-		# Get the first line from the version info files.  This is just in
-		# vase there are extra lines in the files.
-		avers=`head --lines=1 $aver`
-		gvers=`head --lines=1 $gver`
-
-		if [ $debug -eq 1 ]
-		then
-		    echo "  redhat-rpm-config: Annobin plugin built by gcc $avers"
-		    echo "  redhat-rpm-config: GCC     plugin built by gcc $gvers"
-		fi
-
-		# If both plugins were built by the same version of gcc then select
-		# the one from the annobin package (in case it is built from newer
-		# sources).  If the plugin builder versions differ, select the gcc
-		# built version instead.  This assumes that the gcc built version
-		# always matches the installed gcc, which should be true.
-		if [ $avers = $gvers ]
-		then
-		    if [ $debug -eq 1 ]
-		    then
-			echo "  redhat-rpm-config: Both plugins built by the same compiler - using annobin-built plugin"
-		    fi
-		    install_annobin_version=1
-		else
-		    if [ $debug -eq 1 ]
-		    then
-			echo "  redhat-rpm-config: Versions differ - using gcc-built plugin"
-		    fi
-		    install_gcc_version=1
-		fi
-	    else
-		if [ $debug -eq 1 ]
-		then
-		    echo "  redhat-rpm-config: Annobin version file does not exist, using gcc-built plugin"
-		fi
-		install_gcc_version=1
-	    fi
-	else
-	    if [ -f $aver ]
-	    then
-		# FIXME: This is suspicious.  If the installed GCC does not supports plugins
-		# then enabling the annobin plugin will not work.
-		if [ $debug -eq 1 ]
-		then
-		    echo "  redhat-rpm-config: GCC plugin version file does not exist, using annobin-built plugin"
-		fi
-		install_annobin_version=1
-	    else
-		if [ $debug -eq 1 ]
-		then
-		    echo "  redhat-rpm-config: Neither version file exists - playing safe and using gcc-built plugin"
-		    echo "  redhat-rpm-config: Note: expected to find $aver and/or $gver"
-		fi
-		install_gcc_version=1
-	    fi
-	fi
-    else
-	if [ $debug -eq 1 ]
-	then
-	    echo "  redhat-rpm-config: Only the annobin plugin exists - using that"
-	fi
-	install_annobin_version=1
-    fi
-else
-    if [ -f $gplugin ]
-    then
-	if [ $debug -eq 1 ]
-	then
-	    echo "  redhat-rpm-config: Only the gcc plugin exists - using that"
-	fi
-    else
-	if [ $debug -eq 1 ]
-	then
-	    echo "  redhat-rpm-config: Neither plugin exists - playing safe and using gcc-built plugin"
-	    echo "  redhat-rpm-config: Note: expected to find $aplugin and/or $gplugin"
-	fi
-    fi
-    install_gcc_version=1
-fi
-
-if [ $install_annobin_version -eq 1 ]
-then
-    if [ $debug -eq 1 ]
-    then
-	echo "  redhat-rpm-config: Installing annobin version of $rac1"
-    fi
-    pushd $rrcdir > /dev/null
-    rm -f $rac1
-    ln -s $select_annobin "$rac1"
-    popd > /dev/null
-    
-else if [ $install_gcc_version -eq 1 ]
-     then
-	if [ $debug -eq 1 ]
-	then
-	    echo "  redhat-rpm-config: Installing gcc version of $rac1"
-	fi
-	pushd $rrcdir > /dev/null
-	rm -f $rac1
-	ln -s $select_gcc $rac1
-	popd > /dev/null
-     fi
-fi

SOURCES/redhat-annobin-select-annobin-built-plugin

@@ -1,2 +0,0 @@
-*cc1_options:
-+ %{!-fno-use-annobin:%{!iplugindir*:%:find-plugindir()} -fplugin=annobin}

SOURCES/redhat-annobin-select-gcc-built-plugin

@@ -1,2 +0,0 @@
-*cc1_options:
-+ %{!-fno-use-annobin:%{!iplugindir*:%:find-plugindir()} -fplugin=gcc-annobin}

SPECS/redhat-rpm-config.spec

@@ -6,8 +6,8 @@
 
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
-Version: 131
+Version: 129
-Release: 1%{?dist}
+Release: 1%{?dist}.alma
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -27,9 +27,6 @@ Source51: redhat-hardened-ld
 
 # gcc specs files for annobin builds
 Source52: redhat-annobin-cc1
-Source53: redhat-annobin-select-gcc-built-plugin
-Source54: redhat-annobin-select-annobin-built-plugin
-Source55: redhat-annobin-plugin-select.sh
 
 # The macros defined by these files are for things that need to be defined
 # at srpm creation time when it is not feasible to require the base packages
@@ -108,7 +105,6 @@ Requires: rpm >= 4.11.0
 Requires: dwz >= 0.4
 Requires: zip
 Requires: (annobin if gcc)
-Requires: (gcc-plugin-annobin if gcc)
 
 # for brp-mangle-shebangs
 Requires: %{_bindir}/find
@@ -174,54 +170,6 @@ install -p -m 755 -t %{buildroot}%{_rpmconfigdir} kmod.prov
 install -p -m 644 %{SOURCE20} %{buildroot}%{_fileattrsdir}/kabi.attr
 install -p -m 755 %{SOURCE21} %{buildroot}%{_rpmconfigdir}/kabi.sh
 
-# This trigger is used to decide which version of the annobin plugin for gcc
-# should be used.  See comments in the script for full details.
-#
-# Note: for RHEL the rpm containing the annobin built plugin is called
-# "annobin", whereas in Fedora it is called "annobin-plugin-gcc".  This is
-# for historical reasons and will change with the introduction of RHEL-10.
-#
-# Note - whilst "gcc-plugin-annobin" requires "gcc" and hence in theory we
-# do not need to trigger on "gcc", the redhat-annobin-plugin-select.sh
-# script invokes gcc to determine the version of the gcc plugin, and this
-# can be significant.
-#
-# For example, suppose that version N of gcc is installed and that annobin
-# version A (built by gcc version N) is also installed.  Then a new version
-# of gcc is released.  If the rpms are updated in this order:
-#   gcc-plugin-annobin
-#   gcc
-# then when the trigger for gcc-plugin-annobin is run, the script will see
-# (the not yet updated) gcc is currently version N, which matches the current
-# annobin plugin A, so no changes are necessary.  Then gcc is updated and,
-# if the trigger below did not include "gcc", the script would not run again
-# and so now you would have an out of date version of the annobin plugin.
-#
-# Alternatively imagine installing gcc and annobin for the first time.
-# If the installation order is:
-#    gcc
-#    annobin-plugin-gcc
-#    gcc-plugin-annobin
-# then the installation of gcc will not cause the gcc-plugin-annobin to be
-# selected, since it does not exist yet.  Then annobin-plugin-gcc is installed
-# and since it is the only plugin, it will be selected.  Then
-# gcc-plugin-annobin is installed, and if the trigger below was not set to
-# run on gcc-plugin-annobin, it would pass unnoticed.
-#
-# Hence it is necessary to trigger on both gcc and gcc-plugin-annobin.
-
-%triggerin -- annobin gcc-plugin-annobin gcc
-%{rrcdir}/redhat-annobin-plugin-select.sh
-%end
-
-# We also trigger when an annobin plugin is uninstalled.  This allows us to switch
-# over to the other version of the plugin.  It does not matter if
-# gcc is uninstalled, since if that happens the plugin cannot be used.
-
-%triggerpostun -- annobin gcc-plugin-annobin
-%{rrcdir}/redhat-annobin-plugin-select.sh
-%end
-
 %files
 %dir %{rrcdir}
 %{rrcdir}/macros
@@ -246,12 +194,6 @@ install -p -m 755 %{SOURCE21} %{buildroot}%{_rpmconfigdir}/kabi.sh
 %{_rpmconfigdir}/macros.d/macros.kernel-srpm
 %{_rpmconfigdir}/macros.d/macros.fedora-misc
 %{_rpmconfigdir}/kabi.sh
-
-%attr(0755,-,-) %{rrcdir}/redhat-annobin-plugin-select.sh
-%verify(owner group mode) %{rrcdir}/redhat-annobin-cc1
-%{rrcdir}/redhat-annobin-select-gcc-built-plugin
-%{rrcdir}/redhat-annobin-select-annobin-built-plugin
-
 %doc buildflags.md
 
 %files -n kernel-rpm-macros
@@ -268,12 +210,8 @@ install -p -m 755 %{SOURCE21} %{buildroot}%{_rpmconfigdir}/kabi.sh
 %{_rpmconfigdir}/macros.d/macros.kmp
 
 %changelog
-* Wed Feb 08 2023 Nick Clifton  <nickc@redhat.com> - 131-1
+* Tue May 10 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 129-1.alma
-- Fix triggers for the installation and removal of gcc-plugin-annobin.  (#2168233)
+- Fix AlmaLinux detection
-
-* Tue Apr 05 2022 Nick Clifton <nickc@redhat.com> = 130-1
-- Select between gcc-built and annobin-built versions of the annobin plugin.
-  (#2067153)
 
 * Wed Mar 23 2022 Michal Domonkos <mdomonko@redhat.com> - 129-1
 - Fix handling of files without newlines in brp-mangle-shebang (#2063036)