diff --git a/kmodtool-brp-kmodsign b/kmodtool-brp-kmodsign new file mode 100644 index 0000000..437633e --- /dev/null +++ b/kmodtool-brp-kmodsign @@ -0,0 +1,45 @@ +#! /bin/bash + +# The modules_sign target checks for corresponding .o files for every .ko that +# is signed. This doesn't work for package builds which re-use the same build +# directory for every flavour, and the .config may change between flavours. +# So instead of using this script to just sign lib/modules/$KernelVer/extra, +# sign all .ko in the buildroot. + +# This essentially duplicates the 'modules_sign' Kbuild target and runs the +# same commands for those modules. + +MODSECKEY="$1" +MODPUBKEY="$2" +KERNELSRCDIR="$4" + +MOD_DIR="$3" +SCRIPTS_SIGN_BIN="scripts/sign-file" + +if [ -z "${MODSECKEY}" ] || [ -z "${MODPUBKEY}" ] || [ -z "${MOD_DIR}" ] ; then + echo "brp-kmodsign: missing parameters" + exit 1 +fi +if [ -z "${KERNELSRCDIR}" ] ; then + KERNELSRCDIR="." +fi +if [ ! -x "${KERNELSRCDIR}/${SCRIPTS_SIGN_BIN}" ] ; then + echo "brp-kmodsign: ${KERNELSRCDIR}/${SCRIPTS_SIGN_BIN} not found or not executable" + exit 1 +fi + +MODULES=$(find "${MOD_DIR}" -name "*.ko") + +for MOD in ${MODULES} +do + "${KERNELSRCDIR}/${SCRIPTS_SIGN_BIN}" sha256 "${MODSECKEY}" "${MODPUBKEY}" "${MOD}" + rm -f "${MOD}".{sig,dig} +done + +RANDOMMOD=$(find "${MOD_DIR}" -type f -name "*.ko" | sort -R | head -n 1) +if [ "~Module signature appended~" != "$(tail -c 28 ${RANDOMMOD})" ] ; then + echo "brp-kmodsign: modules are unsigned!" + exit 1 +fi + +exit 0 diff --git a/kmodtool-kernel-variants b/kmodtool-kernel-variants index b047f21..6b04ec1 100644 --- a/kmodtool-kernel-variants +++ b/kmodtool-kernel-variants @@ -1 +1 @@ -@(smp?(-debug)|PAE?(-debug)|lpae|debug|kdump|xen|kirkwood|highbank|imx|omap|tegra) +@(smp?(-debug)|PAE?(-debug)|lpae|debug|kdump|xen|kirkwood|highbank|imx|omap|tegra|rt) diff --git a/kmodtool-kmodtool b/kmodtool-kmodtool index fe15432..4a93e35 100644 --- a/kmodtool-kmodtool +++ b/kmodtool-kmodtool @@ -3,7 +3,8 @@ # kmodtool - Helper script for building kernel module RPMs # Copyright (c) 2003-2012 Ville Skyttä , # Thorsten Leemhuis -# Nicolas Chauvet +# Copyright (c) 2012-2019 Nicolas Chauvet +# Copyright (c) 2017-2018 Nicolas Viéville # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -34,10 +35,19 @@ build_kernels="current" kernels_known_variants= kernel_versions= kernel_versions_to_build_for= -prefix= filterfile= target= +kernel_uname_r="" +kernel_uname_r_vanilla="" +kernel_uname_r_short="" +kernel_uname_r_wo_arch="" +kernel_uname_r_dist="" +kernel_uname_r_rel="" +kernel_uname_r_rel_plus_one="" +kernel_uname_r_short_plus_one="" +kernel_uname_r_rel_minor="" + error_out() { local errorlevel=${1} @@ -51,12 +61,90 @@ error_out() print_rpmtemplate_header() { echo - echo '%global kmodinstdir_prefix '/usr/lib/modules/ + echo '%global kmodinstdir_prefix '${usr_lib_modules}/ echo '%global kmodinstdir_postfix '/extra/${kmodname}/ echo '%global kernel_versions '${kernel_versions} echo } +init_kernel_uname_r_vars() +{ + ## Build some interesting strings with kernel uname -r + ## Examples: + ## - Fedora and rhel: + ## kernel_uname_r 3.10.0-693.2.2.el7.x86_64 + ## kernel_uname_r_vanilla 3.10.0 + ## kernel_uname_r_short 3.10.0-693.el7 + ## kernel_uname_r_wo_arch 3.10.0-693.2.2.el7 + ## kernel_uname_r_dist el7 + ## kernel_uname_r_rel 693 + ## kernel_uname_r_rel_plus_one 694 + ## kernel_uname_r_short_plus_one 3.10.0-694.el7 + ## kernel_uname_r_rel_minor 2.2 + ## + kernel_uname_r=${1} + kernel_uname_r_vanilla=$(echo ${1} | sed -n -e "s/\.${target}//" -e "s/\([[:alnum:]\.]\+\|\)-\(.*\)/\1/p") + kernel_uname_r_short=$(echo ${1} | sed -n -e "s/\.${target}//" -e "s/\(.*\)-\([[:alnum:]]\+\)\(\.[[:alnum:]\.]\+\|\)\(\.el.*\|\.fc.*\)/\1-\2\4/p") + kernel_uname_r_wo_arch=$(echo ${1} | sed -e "s/\.${target}//") + kernel_uname_r_dist=$(echo ${1} | sed -n -e "s/\.${target}//" -e "s/\(.*\)-\([[:alnum:]]\+\.[[:alnum:]]\+\-\|[[:alnum:]]\+\)\([[:alnum:]\.]\+\|\)\(\.el.*\|\.fc.*\)/\4/" -e "s/^\.//p") + kernel_uname_r_rel=$(echo ${1} | sed -n -e "s/\.${target}//" -e "s/\(.*\)-\([[:alnum:]]\+\.[[:alnum:]]\+\-\|[[:alnum:]]\+\.\)\([[:alnum:]\.]\+\|\)\(.*\)/\2/" -e "s/^\.//" -e "s/[\.\-]$//p") + if $(echo "${kernel_uname_r_rel}" | grep -qE '^[0-9]+$') ; then + kernel_uname_r_rel_plus_one=$(( kernel_uname_r_rel+1 )) + else + kernel_uname_r_rel_plus_one="" + fi + kernel_uname_r_short_plus_one=$(echo ${kernel_uname_r_short} | sed -e "s/(//" -e "s/-${kernel_uname_r_rel}\./-${kernel_uname_r_rel_plus_one}\./") + kernel_uname_r_rel_minor=$(echo ${1} | sed -n -e "s/\.${target}//" -e "s/\(.*\)-\([[:alnum:]]\+\.[[:alnum:]]\+\-\|[[:alnum:]]\+\.\)\([[:alnum:]\.]\+\|\)\(\.el.*\|\.fc.*\)/\3/" -e "s/^\.//p") +} + +print_rpmtemplate_macros() +{ + # Defines package names macros depending on distributions (default + # is Fedora): + # - rhel_kabi is set if building for RHEL + # - kmod_pkg_name and pkg_kmod_name are the two possible forms of + # the package name used when building packages modules. First one + # uses kmod as prefix, the second one uses kmod as suffix. These + # macros allow to modify the naming schema regarding the target + # distribution (for example with suffix and prefix different from + # kmod). + # - kmod_obsolete_name same as kmod_pkg_name and pkg_kmod_name but + # for obsolete package name + # + if [[ -n ${obsolete_name} ]] ; then + echo '%global obsolete_name '${obsolete_name} + fi + cat <= %{?epoch:%{epoch}:}%{version} -Provides: ${kmodname}-kmod = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{pkg_kmod_name}-common >= %{?epoch:%{epoch}:}%{version} +Provides: %{pkg_kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release} EOF - if [[ ${obsolete_name} ]]; then - echo "Provides: akmod-${obsolete_name} = ${obsolete_version}" - echo "Obsoletes: akmod-${obsolete_name} < ${obsolete_version}" + if [[ -n "${obsolete_name}" ]] ; then + echo "Provides: akmod-${obsolete_name} = ${obsolete_version}" + echo "Obsoletes: akmod-${obsolete_name} < ${obsolete_version}" fi cat < /dev/null & -%files -n akmod-${kmodname} +%post -n akmod-${kmodname} +[ -x /usr/sbin/akmods-ostree-post ] && /usr/sbin/akmods-ostree-post ${kmodname} %{_usrsrc}/akmods/%{pkg_kmod_name}-%{version}-%{release}.src.rpm + +%files -n akmod-${kmodname} %defattr(-,root,root,-) %{_usrsrc}/akmods/* - EOF } print_akmodmeta () { - cat <= %{?epoch:%{epoch}:}%{version} -Requires(post): /usr/sbin/depmod -Requires(postun): /usr/sbin/depmod + +%package -n %{package_kmod_name} +Summary: ${kmodname} kernel module(s) for %{kmod_for_kernel} +Provides: kernel-modules%{!?with_rhel_kabi:-for-kernel} = ${kernel_uname_r} +%if %{with rhel_kabi} +Provides: installonlypkg(kernel-module) +%endif +Provides: %{pkg_kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{pkg_kmod_name}-common >= %{?epoch:%{epoch}:}%{version} +Requires(post): %{?_prefix_usr}/sbin/depmod +Requires(postun): %{?_prefix_usr}/sbin/depmod +%if %{with rhel_kabi} +Requires(post): %{?_prefix_usr}/sbin/weak-modules +Requires(postun): %{?_prefix_usr}/sbin/weak-modules +%endif EOF - if [[ ${obsolete_name} ]]; then - echo "Provides: kmod-${obsolete_name}-${kernel_uname_r} = ${obsolete_version}" - echo "Obsoletes: kmod-${obsolete_name}-${kernel_uname_r} < ${obsolete_version}" + if [[ -n "${obsolete_name}" ]] ; then + echo + echo "Provides: %{kmod_obsolete_name}-${kernel_uname_r} = ${obsolete_version}" + echo "Obsoletes: %{kmod_obsolete_name}-${kernel_uname_r} < ${obsolete_version}" fi # second part - if [[ ! "${customkernel}" ]]; then - cat < /dev/null || : -%postun -n kmod-${kmodname}-${kernel_uname_r} -/usr/sbin/depmod -aF /boot/System.map-${kernel_uname_r} ${kernel_uname_r} &> /dev/null || : + if [[ ! -n "${customkernel}" ]] ; then + cat </dev/null ; \\\ +elif [ -f /lib/modules/${kernel_uname_r}/System.map ] ; then \\\ + %{?_prefix_usr}/sbin/depmod -aeF /lib/modules/${kernel_uname_r}/System.map ${kernel_uname_r} >/dev/null ; \\\ +else \\\ + %{?_prefix_usr}/sbin/depmod -a >/dev/null ; \\\ +fi || : +%if %{with rhel_kabi} +Requires: kernel >= ${kernel_uname_r_short} +Requires: kernel < ${kernel_uname_r_short_plus_one} +BuildRequires: kernel-devel = ${kernel_uname_r_wo_arch} redhat-rpm-config +%else +Requires: kernel-uname-r = ${kernel_uname_r} +BuildRequires: kernel-devel-uname-r = ${kernel_uname_r} +BuildRequires: gcc +%endif + +%post -n %{package_kmod_name} +%{_kmodtool_depmod_post} + +%if %{with rhel_kabi} +modules=( \$(find ${usr_lib_modules}/${kernel_uname_r}/extra/${kmodname}/ -name "*.ko" -o -name "*.ko.xz") ) +printf '%s\n' "\${modules[@]}" | %{?_prefix_usr}/sbin/weak-modules --add-modules +%endif + +%if %{with rhel_kabi} +%preun -n %{package_kmod_name} +rpm -ql %{package_kmod_name}-%{version}-%{release}.$(arch) | grep -e '\.ko$' -e '\.ko.xz$' > /var/run/rpm-%{package_kmod_name}-modules +%endif + +%postun -n %{package_kmod_name} +%{_kmodtool_depmod_post} + +%if %{with rhel_kabi} +modules=( \$(cat /var/run/rpm-%{package_kmod_name}-modules) ) +rm -f /var/run/rpm-%{package_kmod_name}-modules +printf '%s\n' "\${modules[@]}" | %{?_prefix_usr}/sbin/weak-modules --remove-modules +%endif EOF else - cat < /dev/null || : -%postun -n kmod-${kmodname}-${kernel_uname_r} -[[ "$(uname -r)" == "${kernel_uname_r}" ]] && /usr/sbin/depmod -a > /dev/null || : + cat < /dev/null || : + +%if %{with rhel_kabi} +if [[ "\$(uname -r)" == "${kernel_uname_r}" ]] ; then + modules=( \$(find ${usr_lib_modules}/${kernel_uname_r}/extra/${kmodname}/ -name "*.ko" -o -name "*.ko.xz") ) + printf '%s\n' "\${modules[@]}" | %{?_prefix_usr}/sbin/weak-modules --add-modules +fi +%endif + +%if %{with rhel_kabi} +%preun -n %{package_kmod_name} +if [[ "\$(uname -r)" == "${kernel_uname_r}" ]] ; then + rpm -ql %{package_kmod_name}-%{version}-%{release}.$(arch) | grep -e '\.ko$' -e '\.ko.xz$' > /var/run/rpm-%{package_kmod_name}-modules +fi +%endif + +%postun -n %{package_kmod_name} +[[ "\$(uname -r)" == "${kernel_uname_r}" ]] && %{?_prefix_usr}/sbin/depmod -a > /dev/null || : + +%if %{with rhel_kabi} +if [[ "\$(uname -r)" == "${kernel_uname_r}" ]] ; then + modules=( \$(cat /var/run/rpm-%{package_kmod_name}-modules) ) + rm -f /var/run/rpm-%{package_kmod_name}-modules + printf '%s\n' "\${modules[@]}" | %{?_prefix_usr}/sbin/weak-modules --remove-modules +fi +%endif EOF fi - # third part + # third part cat <= %{?epoch:%{epoch}:}%{version}-%{release} +%package -n %{kmod_pkg_name}${kernel_variant} +Summary: Metapackage which tracks in ${kmodname} kernel module for newest kernel${kernel_variant} + +Provides: %{pkg_kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{package_kmod_name} >= %{?epoch:%{epoch}:}%{version}-%{release} EOF - - if [[ ${obsolete_name} ]]; then - echo "Provides: kmod-${obsolete_name}${kernel_variant} = ${obsolete_version}" - echo "Obsoletes: kmod-${obsolete_name}${kernel_variant} < ${obsolete_version}" + + if [[ -n "${obsolete_name}" ]] ; then + echo "Provides: %{kmod_obsolete_name}${kernel_variant} = ${obsolete_version}" + echo "Obsoletes: %{kmod_obsolete_name}${kernel_variant} < ${obsolete_version}" fi cat < -- look for our shared files in " + # FIXME echo " --datadir -- look for our shared files in " echo " --filterfile -- filter the results with grep --file " echo " --for-kernels -- created templates only for these kernels" echo " --kmodname -- name of the kmod (required)" @@ -297,9 +498,9 @@ while [ "${1}" ] ; do case "${1}" in --filterfile) shift - if [[ ! "${1}" ]] ; then + if [[ ! -n "${1}" ]] ; then error_out 2 "Please provide path to a filter-file together with --filterfile" >&2 - elif [[ ! -e "${1}" ]]; then + elif [[ ! -e "${1}" ]] ; then error_out 2 "Filterfile ${1} not found" >&2 fi filterfile="${1}" @@ -307,26 +508,26 @@ while [ "${1}" ] ; do ;; --kmodname) shift - if [[ ! "${1}" ]] ; then + if [[ ! -n "${1}" ]] ; then error_out 2 "Please provide the name of the kmod together with --kmodname" >&2 - fi + fi # strip pending -kmod kmodname="${1%%-kmod}" shift ;; --repo) shift - if [[ ! "${1}" ]] ; then + if [[ ! -n "${1}" ]] ; then error_out 2 "Please provide the name of the repo together with --repo" >&2 - fi + fi repo=${1} shift ;; --for-kernels) shift - if [[ ! "${1}" ]] ; then + if [[ ! -n "${1}" ]] ; then error_out 2 "Please provide the name of the kmod together with --kmodname" >&2 - fi + fi for_kernels="${1}" shift ;; @@ -336,17 +537,17 @@ while [ "${1}" ] ; do ;; --obsolete-name) shift - if [[ ! "${1}" ]] ; then + if [[ ! -n "${1}" ]] ; then error_out 2 "Please provide the name of the kmod to obsolte together with --obsolete-name" >&2 - fi + fi obsolete_name="${1}" shift ;; --obsolete-version) shift - if [[ ! "${1}" ]] ; then + if [[ ! -n "${1}" ]] ; then error_out 2 "Please provide the version of the kmod to obsolte together with --obsolete-version" >&2 - fi + fi obsolete_version="${1}" shift ;; @@ -377,36 +578,41 @@ while [ "${1}" ] ; do ;; *) echo "Error: Unknown option '${1}'." >&2 - usage >&2 + myprog_help >&2 exit 2 ;; esac done -if [[ -e ./kmodtool-kernel-variants ]]; then +# These should always be in /lib/modules +# as that's how the kernel package lays them out +usr_lib_modules=/lib/modules + +if [[ -e ./kmodtool-kernel-variants ]] ; then kernels_known_variants="$(cat ./kmodtool-kernel-variants)" elif [[ -e /usr/share/kmodtool/kernel-variants ]] ; then kernels_known_variants="$(cat /usr/share/kmodtool/kernel-variants)" else - error_out 2 "Could not find /usr/share/kmodtool/kernel-variants" + error_out 2 "Could not find /usr/share/kmodtool/kernel-variants" fi # general sanity checks -if [[ ! "${target}" ]]; then - error_out 2 "please pass target arch with --target" -elif [[ ! "${kmodname}" ]]; then - error_out 2 "please pass kmodname with --kmodname" -elif [[ ! "${kernels_known_variants}" ]] ; then - error_out 2 "could not determine known variants" -elif ( [[ "${obsolete_name}" ]] && [[ ! "${obsolete_version}" ]] ) || ( [[ ! "${obsolete_name}" ]] && [[ "${obsolete_version}" ]] ) ; then - error_out 2 "you need to provide both --obsolete-name and --obsolete-version" +if [[ ! -n "${target}" ]] ; then + error_out 2 "please pass target arch with --target" +elif [[ ! -n "${kmodname}" ]] ; then + error_out 2 "please pass kmodname with --kmodname" +elif [[ ! -n "${kernels_known_variants}" ]] ; then + error_out 2 "could not determine known variants" +elif ( [[ -n "${obsolete_name}" ]] && [[ ! -n "${obsolete_version}" ]] ) || ( [[ ! -n "${obsolete_name}" ]] && [[ -n "${obsolete_version}" ]] ) ; then + error_out 2 "you need to provide both --obsolete-name and --obsolete-version" fi # go -if [[ "${for_kernels}" ]]; then +print_rpmtemplate_macros +if [[ -n "${for_kernels}" ]] ; then # this is easy: print_customrpmtemplate "${for_kernels}" -elif [[ "${build_kernels}" == "akmod" ]]; then +elif [[ "${build_kernels}" == "akmod" ]] ; then # do only a akmod package print_akmodtemplate print_akmodmeta @@ -414,7 +620,7 @@ else # seems we are on out own to decide for which kernels to build # we need more sanity checks in this case - if [[ ! "${repo}" ]]; then + if [[ ! -n "${repo}" ]] ; then error_out 2 "please provide repo name with --repo" elif ! $(which buildsys-build-${repo}-kerneldevpkgs &> /dev/null) ; then error_out 2 "buildsys-build-${repo}-kerneldevpkgs not found" @@ -423,20 +629,20 @@ else # call buildsys-build-${repo}-kerneldevpkgs to get the list of kernels cmdoptions="--target ${target}" - # filterfile to filter list of kernels? - if [[ "${filterfile}" ]] ; then - cmdoptions="${cmdoptions} --filterfile ${filterfile}" + # filterfile to filter list of kernels? + if [[ -n "${filterfile}" ]] ; then + cmdoptions="${cmdoptions} --filterfile ${filterfile}" fi kernel_versions_to_build_for="$(buildsys-build-${repo}-kerneldevpkgs --${build_kernels} ${cmdoptions})" returncode=$? - if (( ${returncode} != 0 )); then + if (( ${returncode} != 0 )) ; then error_out 2 "buildsys-build-${repo}-kerneldevpkgs failed: $(buildsys-build-${repo}-kerneldevpkgs --${build_kernels} ${cmdoptions})" fi - if [[ "${build_kernels}" == "current" ]] && [[ ! "${noakmod}" ]]; then + if [[ "${build_kernels}" == "current" ]] && [[ ! -n "${noakmod}" ]] ; then print_akmodtemplate fi - print_rpmtemplate + print_rpmtemplate fi diff --git a/kmodtool.spec b/kmodtool.spec index 0a68178..ce40307 100644 --- a/kmodtool.spec +++ b/kmodtool.spec @@ -1,14 +1,20 @@ +# Define rpm macros directory for rhel6 and rhel7 +%{!?_rpmmacrodir: %define _rpmmacrodir /usr/lib/rpm/macros.d} + Name: kmodtool -Version: 1 -Release: 24%{?dist} +Version: 1.1 +Release: 14%{?dist} Summary: Tool for building kmod packages License: MIT URL: http://rpmfusion.org/Packaging/KernelModules/Kmods2 # We are upstream, these files are maintained directly in pkg-git Source1: %{name}-kmodtool Source2: %{name}-kernel-variants +Source3: kmodtool-brp-kmodsign +Source4: macros.kmodtool BuildArch: noarch + %description This package contains tools and list of recent kernels that get used when building kmod-packages. @@ -23,21 +29,145 @@ building kmod-packages. %install -mkdir -p $RPM_BUILD_ROOT/%{_bindir} $RPM_BUILD_ROOT/%{_datadir}/%{name}/ -install -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/kmodtool -install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/%{name}/kernel-variants - -# adjust default-path -sed -i 's|^default_prefix=.*|default_prefix=%{_datadir}/%{name}/|' \ - $RPM_BUILD_ROOT/%{_bindir}/kmodtool +mkdir -p -m 0755 %{buildroot}%{_bindir} \ + %{buildroot}%{_datadir}/%{name} \ + %{buildroot}%{_rpmconfigdir} \ + %{buildroot}%{_rpmmacrodir} +install -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/kmodtool +install -p -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/%{name}/kernel-variants +install -p -m 0755 %{SOURCE3} %{buildroot}%{_rpmconfigdir}/brp-kmodsign +install -p -m 0644 %{SOURCE4} %{buildroot}%{_rpmmacrodir}/ %files %{_bindir}/* %{_datadir}/%{name} - +%{_rpmconfigdir}/brp-kmodsign +%{_rpmmacrodir}/macros.kmodtool %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Thu Mar 06 2025 Leigh Scott - 1.1-13 +- Use fedora compression flags + +* Fri Jan 17 2025 Fedora Release Engineering - 1.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jul 18 2024 Fedora Release Engineering - 1.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 1.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 1.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jan 12 2023 FeRD (Frank Dana) - 1.1-6 +- Fix usage output on unrecognized argument + +* Thu Jul 21 2022 Fedora Release Engineering - 1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sun Apr 03 2022 Sérgio Basto - 1.1-4 +- kernel-abi-whitelists is not needed and break builds on el9 + +* Thu Jan 20 2022 Fedora Release Engineering - 1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Dec 20 2021 Nicolas Chauvet - 1.1-2 +- Revert suse commit in kmodtool + +* Fri Oct 22 2021 Nicolas Viéville - 1.1-1 +- Add signing module method to use with UEFI Secure Boot machines thanks + to Stanislas Leduc (#1454824) (reworked method) +- Add as well zipping module method and support for it in Fedora and RHEL + +* Fri Oct 22 2021 Nicolas Viéville - 1-44 +- Fix indentation +- Add installonlypkg(kernel-module) to allow kmod packages co-install (RHEL) +- Convert if statement from "[!] $variable" to "[!] -n $variable" +- Remove unused variables and code +- Force remove temporary file +- Remove grep pipe after find command +- Standardize globally kmod package names macros and kernel_uname_r + variables in order to ease the build of kmod packages for non-default + distribution (Fedora), for example for RHEL +- Try to fix: check if uname from Makefile is the same as kernel variable + +* Thu Jul 22 2021 Fedora Release Engineering - 1-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 1-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 06 2020 Neal Gompa - 1-40 +- Always use /lib/modules for kmod install path + +* Mon Jul 06 2020 Neal Gompa - 1-39 +- Don't force-disable debuginfo subpackages + +* Wed Jan 29 2020 Fedora Release Engineering - 1-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sun Oct 13 2019 Sérgio Basto - 1-37 +- Fix package name in epel scriptlets + +* Thu Oct 10 2019 Leigh Scott - 1-36 +- Fix naming conflict with kmod meta package + +* Thu Jul 25 2019 Fedora Release Engineering - 1-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu May 16 2019 Nicolas Chauvet - 1-34 +- Add _kmodtool_depmod_post - rhbz#1703715 + +* Thu Feb 28 2019 Alexander Larsson - 1-33 +- Call akmods-ostree-post to support ostree/silverblue builds - rhbz#1667014 + +* Fri Feb 01 2019 Fedora Release Engineering - 1-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Nov 07 2018 Nicolas Viéville - 1-31 +- Update copyrights +- Add BuildRequires for gcc to build kmod modules for fc29+ + +* Fri Jul 13 2018 Fedora Release Engineering - 1-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Mar 26 2018 Nicolas Chauvet - 1-29 +- Update copyrights +- Drop Group field +- Patches from Nicolas Vieville - Enhancements for RHEL kernel: +- remove unneeded uname-r sub-package for RHEL +- enforce a range dependency for kernels +- register modules with /usr/sbin/weak-modules +- use depmod as seen in example file /usr/lib/rpm/redhat/kmodtool +- Add -e to depmod. + +* Wed Feb 07 2018 Fedora Release Engineering - 1-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Oct 09 2017 Robert Scheck - 1-27 +- Revert my previous conditional fix for (/usr)/sbin/depmod + and apply the kmodtool patch by Nicolas Vieville (#1484293) + +* Tue Sep 19 2017 Robert Scheck - 1-26 +- Add conditional fix for (/usr)/sbin/depmod for RHEL/CentOS 6 + +* Wed Jul 26 2017 Fedora Release Engineering - 1-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Thu Feb 16 2017 Hans de Goede - 1-24 - Modernize .spec a bit - Submit to Fedora for package review @@ -101,11 +231,11 @@ sed -i 's|^default_prefix=.*|default_prefix=%{_datadir}/%{name}/|' \ - integrate akmodstool into kmodtool * Mon Dec 17 2007 Thorsten Leemhuis - 1-5 -- update kmodtool, so the kmod-foo- package does not require the +- update kmodtool, so the kmod-foo- package does not require the kmod-foo package when building for kernels that were passed with for-kernels * Tue Dec 04 2007 Thorsten Leemhuis - 1-4 -- update kmodtool, so the kmod-foo metapackage requires the proper version +- update kmodtool, so the kmod-foo metapackage requires the proper version of the kmod-foo- package * Tue Dec 04 2007 Thorsten Leemhuis - 1-3 @@ -163,7 +293,7 @@ sed -i 's|^default_prefix=.*|default_prefix=%{_datadir}/%{name}/|' \ * Wed Oct 03 2007 Thorsten Leemhuis - 5-1 - disable --all-but-latest stuff -- does not work as expected -- rename up2date list of kernels from "latest" to "current" as latest +- rename up2date list of kernels from "latest" to "current" as latest and newest are to similar in wording; asjust script as well - kmodtool: don't provide kernel-modules, not needed anymore with the new stayle and hurts @@ -177,12 +307,12 @@ sed -i 's|^default_prefix=.*|default_prefix=%{_datadir}/%{name}/|' \ - s/latests/latest/ - update kernel lists for rawhide and test2 kernels - make kmod-helpers-livna-list-kernels print BuildRequires for all kernels - as well; this is not needed and will slow build a bit as it will track + as well; this is not needed and will slow build a bit as it will track all the kernel-devel packages in, but that way we make sure they are really available in the buildsys * Fri Sep 07 2007 Thorsten Leemhuis - 3-4 -- implement proper arch deps +- implement proper arch deps * Fri Sep 07 2007 Thorsten Leemhuis - 3-3 - proper list of todays rawhide-kernels diff --git a/macros.kmodtool b/macros.kmodtool new file mode 100644 index 0000000..46c6034 --- /dev/null +++ b/macros.kmodtool @@ -0,0 +1,114 @@ +# /etc/rpm/macros.kmodtool: kmodtool keypair sign and zip config. +# +# This file controls signing and zipping modules on the system, included +# akmods ones. +# It uses the rpm macros syntax to define global symbol imported +# directly by kmodtool while rebuilding kmods. +# +# Signing modules +# +# __kmodtool_signmodules can take one of these two values: +# 1 - Modules would be signed when rebuilding modules. +# 0 - No signed modules when rebuilding modules. +# __kmodtool_signmodules_pubkey gives path and name of the public key to +# be used to sign newly build modules. +# __kmodtool_signmodules_privkey gives path and name of the private key to +# be used to sign newly build modules. +# +# __kmodtool_signmodules* macros can be overriden by users and/or +# packagers provided that those values and their dependencies are +# manually checked. Be carefull when modifying these values. To override +# these macros please define these ones in your spec file (one +# underscore as prefix and not two): +# - _kmodtool_signmodules +# - _kmodtool_signmodules_pubkey +# - _kmodtool_signmodules_privkey +# It is also possible to uncomment one or several of the macros provided +# below: +#%%_kmodtool_signmodules 0 +#%%_kmodtool_signmodules 1 +#%%_kmodtool_signmodules_pubkey /path/to/your/public_key.der +#%%_kmodtool_signmodules_privkey /path/to/your/private_key.der +# +# Signing modules is enabled in Fedora kernels for every arches, +# even if kernels are not signed for arches other than +# %%{ix86} x86_64 aarch64. +# +# Sign modules on x86. Make sure the config files match this setting if +# more architectures are added. +%__kmodtool_signmodules %{?_kmodtool_signmodules:%{_kmodtool_signmodules}}%{!?_kmodtool_signmodules:1} + +# This is current keypair enrolled in MOK to sign modules +%__kmodtool_signmodules_pubkey %{?_kmodtool_signmodules_pubkey:%{_kmodtool_signmodules_pubkey}}%{!?_kmodtool_signmodules_pubkey:/etc/pki/akmods/certs/public_key.der} +%__kmodtool_signmodules_privkey %{?_kmodtool_signmodules_privkey:%{_kmodtool_signmodules_privkey}}%{!?_kmodtool_signmodules_privkey:/etc/pki/akmods/private/private_key.priv} + +# Define signing macros +# +%__kmodtool_modsign_cmd %{_rpmconfigdir}/brp-kmodsign +%__kmodtool_modsign_install_post \ +if [ "%{__kmodtool_signmodules}" -eq "1" ] && [ -x %{__kmodtool_modsign_cmd} ] && [ -e %{__kmodtool_signmodules_privkey} ] && [ -e %{__kmodtool_signmodules_pubkey} ] ; then\ + %{__kmodtool_modsign_cmd} %{__kmodtool_signmodules_privkey} %{__kmodtool_signmodules_pubkey} %{buildroot}%{kmodinstdir_prefix}%{__kmodtool_kernel_uname_r}%{kmodinstdir_postfix} /usr/src/kernels/%{__kmodtool_kernel_uname_r}\ +fi\ +%{nil} + +# Zipping modules +# +# __kmodtool_zipmodules can take one of these two values: +# 1 - Modules would be zipped when rebuilding modules. +# 0 - No zipped modules when rebuilding modules. +# +# __kmodtool_zipmodules* macros can be overriden by users and/or packagers +# provided that those values and their dependencies are manually +# checked. Be carefull when modifying these values. To override these +# macros please define these ones in your spec file (one underscore as +# prefix and not two): +# - _kmodtool_zipmodules +# It is also possible to uncomment one of the macros provided below: +#%%_kmodtool_zipmodules 0 +#%%_kmodtool_zipmodules 1 +# +# Zipping modules according to Fedora kernels sources is enabled only +# for arches %%{ix86} x86_64 aarch64. For information zipping kernel +# modules is available since rhel 7.x and fedora 21. +# Settings below conform to this directives. +# +# Zip modules on x86 x86_64 aarch64. Make sure the config files match +# this setting if more architectures are added. +%__kmodtool_zipmodules_arch_ok %( +echo %{ix86} x86_64 aarch64 | grep -qwo %{_arch} +if [ $? -eq 0 ] ; then + echo 1 +else + echo 0 +fi +) + +# Distributions where zipping is enabled by default +%__kmodtool_zipmodules_dist_ok %( +if (( %{?rhel} + 0 > 6 || %{?fedora} + 0 > 20 )) ; then + echo 1 +else + echo 0 +fi +) + +# Put arches and distributions conditions together +%__kmodtool_zipmodules_ok %( +if (( %{?__kmodtool_zipmodules_arch_ok} && %{?__kmodtool_zipmodules_dist_ok} )) ; then + echo 1 +else + echo 0 +fi +) + +# Put them all in place +%__kmodtool_zipmodules %{?_kmodtool_zipmodules:%{_kmodtool_zipmodules}}%{!?_kmodtool_zipmodules:%{?__kmodtool_zipmodules_ok}} + + +# Define zipping macros +# +%__kmodtool_modzip_install_post\ +if [ "%{__kmodtool_zipmodules}" -eq "1" ] ; then\ + find %{buildroot}%{kmodinstdir_prefix}%{__kmodtool_kernel_uname_r}%{kmodinstdir_postfix} -type f -name '*.ko' | xargs xz --compress --check=crc32 --lzma2=dict=1MiB;\ +fi\ +%{nil}