diff --git a/kmodtool-kmodtool b/kmodtool-kmodtool index 4a93e35..ac9b47f 100644 --- a/kmodtool-kmodtool +++ b/kmodtool-kmodtool @@ -283,7 +283,7 @@ 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 +BuildRequires: kernel-devel = ${kernel_uname_r_wo_arch} redhat-rpm-config kernel-abi-whitelists %else Requires: kernel-uname-r = ${kernel_uname_r} BuildRequires: kernel-devel-uname-r = ${kernel_uname_r} @@ -578,7 +578,7 @@ while [ "${1}" ] ; do ;; *) echo "Error: Unknown option '${1}'." >&2 - myprog_help >&2 + usage >&2 exit 2 ;; esac diff --git a/kmodtool.spec b/kmodtool.spec index ce40307..1bc5cce 100644 --- a/kmodtool.spec +++ b/kmodtool.spec @@ -3,7 +3,7 @@ Name: kmodtool Version: 1.1 -Release: 14%{?dist} +Release: 3%{?dist} Summary: Tool for building kmod packages License: MIT URL: http://rpmfusion.org/Packaging/KernelModules/Kmods2 @@ -46,39 +46,6 @@ install -p -m 0644 %{SOURCE4} %{buildroot}%{_rpmmacrodir}/ %{_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 diff --git a/macros.kmodtool b/macros.kmodtool index 46c6034..9dedd27 100644 --- a/macros.kmodtool +++ b/macros.kmodtool @@ -109,6 +109,6 @@ fi # %__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;\ + find %{buildroot}%{kmodinstdir_prefix}%{__kmodtool_kernel_uname_r}%{kmodinstdir_postfix} -type f -name '*.ko' | xargs xz;\ fi\ %{nil}