From 138b7e74e683f6b354883f9fc9f0aeca76826fc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 3 Apr 2022 07:34:59 +0100 Subject: [PATCH 01/11] kernel-abi-whitelists is not needed and break builds on el9 --- kmodtool-kmodtool | 2 +- kmodtool.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kmodtool-kmodtool b/kmodtool-kmodtool index ac9b47f..de659e1 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 kernel-abi-whitelists +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} diff --git a/kmodtool.spec b/kmodtool.spec index 1bc5cce..97219ac 100644 --- a/kmodtool.spec +++ b/kmodtool.spec @@ -3,7 +3,7 @@ Name: kmodtool Version: 1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool for building kmod packages License: MIT URL: http://rpmfusion.org/Packaging/KernelModules/Kmods2 @@ -46,6 +46,9 @@ install -p -m 0644 %{SOURCE4} %{buildroot}%{_rpmmacrodir}/ %{_rpmmacrodir}/macros.kmodtool %changelog +* 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 From 7f1eac8d7a2b1cb210c5a0b3f44dfc1cffc234c5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 16:27:31 +0000 Subject: [PATCH 02/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kmodtool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kmodtool.spec b/kmodtool.spec index 97219ac..ca6d2ec 100644 --- a/kmodtool.spec +++ b/kmodtool.spec @@ -3,7 +3,7 @@ Name: kmodtool Version: 1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tool for building kmod packages License: MIT URL: http://rpmfusion.org/Packaging/KernelModules/Kmods2 @@ -46,6 +46,9 @@ install -p -m 0644 %{SOURCE4} %{buildroot}%{_rpmmacrodir}/ %{_rpmmacrodir}/macros.kmodtool %changelog +* 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 From 2de108424109b60034b7fb45e7f8faf6dd5879c0 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Thu, 12 Jan 2023 01:28:22 -0500 Subject: [PATCH 03/11] Fix usage output on unrecognized argument --- kmodtool-kmodtool | 2 +- kmodtool.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kmodtool-kmodtool b/kmodtool-kmodtool index de659e1..4a93e35 100644 --- a/kmodtool-kmodtool +++ b/kmodtool-kmodtool @@ -578,7 +578,7 @@ while [ "${1}" ] ; do ;; *) echo "Error: Unknown option '${1}'." >&2 - usage >&2 + myprog_help >&2 exit 2 ;; esac diff --git a/kmodtool.spec b/kmodtool.spec index ca6d2ec..9ea6ac7 100644 --- a/kmodtool.spec +++ b/kmodtool.spec @@ -3,7 +3,7 @@ Name: kmodtool Version: 1.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tool for building kmod packages License: MIT URL: http://rpmfusion.org/Packaging/KernelModules/Kmods2 @@ -46,6 +46,9 @@ install -p -m 0644 %{SOURCE4} %{buildroot}%{_rpmmacrodir}/ %{_rpmmacrodir}/macros.kmodtool %changelog +* 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 From 474076d6f19baa0ddb60f93070bf20a904ef57f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 14:58:21 +0000 Subject: [PATCH 04/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kmodtool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kmodtool.spec b/kmodtool.spec index 9ea6ac7..5191705 100644 --- a/kmodtool.spec +++ b/kmodtool.spec @@ -3,7 +3,7 @@ Name: kmodtool Version: 1.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Tool for building kmod packages License: MIT URL: http://rpmfusion.org/Packaging/KernelModules/Kmods2 @@ -46,6 +46,9 @@ install -p -m 0644 %{SOURCE4} %{buildroot}%{_rpmmacrodir}/ %{_rpmmacrodir}/macros.kmodtool %changelog +* 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 From d3f79a681f4b5d3890437142a4bfc202fe3bbf2f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 09:23:07 +0000 Subject: [PATCH 05/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kmodtool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kmodtool.spec b/kmodtool.spec index 5191705..0612237 100644 --- a/kmodtool.spec +++ b/kmodtool.spec @@ -3,7 +3,7 @@ Name: kmodtool Version: 1.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Tool for building kmod packages License: MIT URL: http://rpmfusion.org/Packaging/KernelModules/Kmods2 @@ -46,6 +46,9 @@ install -p -m 0644 %{SOURCE4} %{buildroot}%{_rpmmacrodir}/ %{_rpmmacrodir}/macros.kmodtool %changelog +* 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 From 5aadb92d21ff6bebcee67e8de4faaca53a7a56e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 01:07:17 +0000 Subject: [PATCH 06/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- kmodtool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kmodtool.spec b/kmodtool.spec index 0612237..35c96ea 100644 --- a/kmodtool.spec +++ b/kmodtool.spec @@ -3,7 +3,7 @@ Name: kmodtool Version: 1.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Tool for building kmod packages License: MIT URL: http://rpmfusion.org/Packaging/KernelModules/Kmods2 @@ -46,6 +46,9 @@ install -p -m 0644 %{SOURCE4} %{buildroot}%{_rpmmacrodir}/ %{_rpmmacrodir}/macros.kmodtool %changelog +* 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 From 2cd63319b0807bef55252ef3b472f661b98569eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 00:43:05 +0000 Subject: [PATCH 07/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- kmodtool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kmodtool.spec b/kmodtool.spec index 35c96ea..32f9b89 100644 --- a/kmodtool.spec +++ b/kmodtool.spec @@ -3,7 +3,7 @@ Name: kmodtool Version: 1.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Tool for building kmod packages License: MIT URL: http://rpmfusion.org/Packaging/KernelModules/Kmods2 @@ -46,6 +46,9 @@ install -p -m 0644 %{SOURCE4} %{buildroot}%{_rpmmacrodir}/ %{_rpmmacrodir}/macros.kmodtool %changelog +* 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 From 99f961acbcc40e6b1844b1fdf48b46f6bf75bc83 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 12:29:17 +0000 Subject: [PATCH 08/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- kmodtool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kmodtool.spec b/kmodtool.spec index 32f9b89..2499e62 100644 --- a/kmodtool.spec +++ b/kmodtool.spec @@ -3,7 +3,7 @@ Name: kmodtool Version: 1.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Tool for building kmod packages License: MIT URL: http://rpmfusion.org/Packaging/KernelModules/Kmods2 @@ -46,6 +46,9 @@ install -p -m 0644 %{SOURCE4} %{buildroot}%{_rpmmacrodir}/ %{_rpmmacrodir}/macros.kmodtool %changelog +* 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 From 5a91c4b4b19eea0644e024f7089d383778788f9e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 09:36:10 +0000 Subject: [PATCH 09/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- kmodtool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kmodtool.spec b/kmodtool.spec index 2499e62..89672a5 100644 --- a/kmodtool.spec +++ b/kmodtool.spec @@ -3,7 +3,7 @@ Name: kmodtool Version: 1.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Tool for building kmod packages License: MIT URL: http://rpmfusion.org/Packaging/KernelModules/Kmods2 @@ -46,6 +46,9 @@ install -p -m 0644 %{SOURCE4} %{buildroot}%{_rpmmacrodir}/ %{_rpmmacrodir}/macros.kmodtool %changelog +* 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 From 85465af0fcd08715fa1ab076fcf7a473e787f43c Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Thu, 6 Mar 2025 10:09:00 +0000 Subject: [PATCH 10/11] Use fedora compression flags --- kmodtool.spec | 5 ++++- macros.kmodtool | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kmodtool.spec b/kmodtool.spec index 89672a5..617a76c 100644 --- a/kmodtool.spec +++ b/kmodtool.spec @@ -3,7 +3,7 @@ Name: kmodtool Version: 1.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Tool for building kmod packages License: MIT URL: http://rpmfusion.org/Packaging/KernelModules/Kmods2 @@ -46,6 +46,9 @@ install -p -m 0644 %{SOURCE4} %{buildroot}%{_rpmmacrodir}/ %{_rpmmacrodir}/macros.kmodtool %changelog +* 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 diff --git a/macros.kmodtool b/macros.kmodtool index 9dedd27..46c6034 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;\ + find %{buildroot}%{kmodinstdir_prefix}%{__kmodtool_kernel_uname_r}%{kmodinstdir_postfix} -type f -name '*.ko' | xargs xz --compress --check=crc32 --lzma2=dict=1MiB;\ fi\ %{nil} From a9a2e93c7c07ada19d4d16fa73300e223cd411f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 18:51:05 +0000 Subject: [PATCH 11/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- kmodtool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kmodtool.spec b/kmodtool.spec index 617a76c..ce40307 100644 --- a/kmodtool.spec +++ b/kmodtool.spec @@ -3,7 +3,7 @@ Name: kmodtool Version: 1.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Tool for building kmod packages License: MIT URL: http://rpmfusion.org/Packaging/KernelModules/Kmods2 @@ -46,6 +46,9 @@ 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