From 78df0af42a7dfb20ed1d07b723539ab34b1d07a2 Mon Sep 17 00:00:00 2001 From: Eugene Syromiatnikov Date: Mon, 21 Jan 2019 08:52:21 +0100 Subject: [PATCH] Re-add contents of redhat-rpm-config-9.1.0-kmod-kabi.patch to RHEL 9 Apply redhat-rpm-config-9.1.0-kmod-kabi.patch from RHEL 7 branch. Applied only changes to kmodtool and macros (now macros.kmp), as all others are applied already. macros.kmp also had a merge conflict due to commits f41a8a73aa6f ("Fix kernel_source macro to match the directory that kernel sources are installed in") and d95e9bc7b618 ("Fix directory name mismatch in kernel_source macro (#648996)") being applied already. Commit message from the original commit: commit 29b4b765391b8f11ae64708e86ac3f7475c62661 Author: Panu Matilainen Date: Tue Jul 9 09:57:29 2013 +0300 - Re-add various kABI-related bits (Jon Masters) - Allow kmod building against z-stream kernels (Jiri Benc) Resolves: #1971748 Resolves: #2002887 Resolves: #2015909 Signed-off-by: Eugene Syromiatnikov --- kmodtool | 161 +++++++++++++++++++++++++++++------------------------ macros.kmp | 27 +++------ 2 files changed, 96 insertions(+), 92 deletions(-) diff --git a/kmodtool b/kmodtool index 1308af2..edf6d4e 100755 --- a/kmodtool +++ b/kmodtool @@ -1,7 +1,12 @@ #!/bin/bash # kmodtool - Helper script for building kernel module RPMs -# Copyright (c) 2003-2006 Ville Skyttä , +# An original version appeared in Fedora. This version is +# generally called only by the %kernel_module_package RPM macro +# during the process of building Driver Update Packages (which +# are also known as "kmods" in the Fedora community). +# +# Copyright (c) 2003-2010 Ville Skyttä , # Thorsten Leemhuis # Jon Masters # @@ -24,21 +29,30 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# Changelog: +# +# 2010/07/28 - Add fixes for filelists in line with LF standard +# - Remove now defunct "framepointer" kernel variant +# - Change version to "rhel6-rh2" as a consequence. +# +# 2010/01/10 - Simplified for RHEL6. We are working on upstream +# moving to a newer format and in any case do not +# need to retain support for really old systems. + shopt -s extglob myprog="kmodtool" myver="0.10.10_kmp2" -knownvariants=@(BOOT|PAE|@(big|huge)mem|debug|enterprise|kdump|?(large)smp|uml|xen[0U]?(-PAE)|xen) +knownvariants=@(debug|kdump) kmod_name= kver= verrel= variant= -kmp= get_verrel () { verrel=${1:-$(uname -r)} - verrel=${verrel%%$knownvariants} + verrel=${verrel/%.$knownvariants/} } print_verrel () @@ -51,7 +65,7 @@ get_variant () { get_verrel $@ variant=${1:-$(uname -r)} - variant=${variant##$verrel} + variant=${variant/#$verrel?(.)/} variant=${variant:-'""'} } @@ -61,117 +75,128 @@ print_variant () echo "${variant}" } +get_filelist() { + local IFS=$'\n' + filelist=($(cat)) + + if [ ${#filelist[@]} -gt 0 ]; + then + for ((n = 0; n < ${#filelist[@]}; n++)); + do + line="${filelist[n]}" + line=$(echo "$line" \ + | sed -e "s/%verrel/$verrel/g" \ + | sed -e "s/%variant/$variant/g" \ + | sed -e "s/%dashvariant/$dashvariant/g" \ + | sed -e "s/%dotvariant/$dotvariant/g" \ + | sed -e "s/\.%1/$dotvariant/g" \ + | sed -e "s/\-%1/$dotvariant/g" \ + | sed -e "s/%2/$verrel/g") + echo "$line" + done + else + echo "%defattr(644,root,root,755)" + echo "/lib/modules/${verrel}${dotvariant}" + fi +} + + get_rpmtemplate () { local variant="${1}" local dashvariant="${variant:+-${variant}}" - case "$verrel" in - *.el*) kdep="kernel${dashvariant}-%{_target_cpu} = ${verrel}" ;; - *.EL*) kdep="kernel${dashvariant}-%{_target_cpu} = ${verrel}" ;; - *) kdep="kernel-%{_target_cpu} = ${verrel}${variant}" ;; - esac + local dotvariant="${variant:+.${variant}}" echo "%package -n kmod-${kmod_name}${dashvariant}" - if [ -z "$kmp_provides_summary" ]; then + if [ -z "$kmod_provides_summary" ]; then echo "Summary: ${kmod_name} kernel module(s)" fi - if [ -z "$kmp_provides_group" ]; then + if [ -z "$kmod_provides_group" ]; then echo "Group: System Environment/Kernel" fi - if [ ! -z "$kmp_version" ]; then - echo "Version: %{kmp_version}" + if [ ! -z "$kmod_version" ]; then + echo "Version: %{kmod_version}" fi - if [ ! -z "$kmp_release" ]; then - echo "Release: %{kmp_release}" + if [ ! -z "$kmod_release" ]; then + echo "Release: %{kmod_release}" fi - if [ ! -z "$kmp" ]; then - echo "%global _use_internal_dependency_generator 0" - fi + # Turn of the internal dep generator so we will use the kmod scripts. + echo "%global _use_internal_dependency_generator 0" cat <= ${verrel}${dotvariant} Provides: ${kmod_name}-kmod = %{?epoch:%{epoch}:}%{version}-%{release} -EOF - - if [ -z "$kmp" ]; then - echo "Requires: ${kdep}" - fi - -# -# RHEL5 - Remove common package requirement on general kmod packages. -# Requires: ${kmod_name}-kmod-common >= %{?epoch:%{epoch}:}%{version} -# - - cat < /dev/null || : -fi +This package provides the ${kmod_name} kernel modules built for +the Linux kernel ${verrel}${dotvariant} for the %{_target_cpu} +family of processors. EOF - if [ ! -z "$kmp" ]; then - cat < /dev/null || : +fi + +modules=( \$(find /lib/modules/${verrel}${dotvariant}/extra/${kmod_name} | grep '\.ko$') ) if [ -x "/sbin/weak-modules" ]; then printf '%s\n' "\${modules[@]}" \ | /sbin/weak-modules --add-modules fi +EOF + +cat < /var/run/rpm-kmod-${kmod_name}${dashvariant}-modules +rpm -ql kmod-${kmod_name}${dashvariant}-%{kmod_version}-%{kmod_release}.$(arch) | grep '\.ko$' > /var/run/rpm-kmod-${kmod_name}${dashvariant}-modules EOF - fi - - cat < /dev/null || : -EOF +if [ -e "/boot/System.map-${verrel}${dotvariant}" ]; then + /sbin/depmod -aeF "/boot/System.map-${verrel}${dotvariant}" "${verrel}${dotvariant}" > /dev/null || : +fi - if [ ! -z "$kmp" ]; then - cat <