From c01db6666af32e98acc7bac0f9288415ffff7cda Mon Sep 17 00:00:00 2001 From: SuperSix173 Date: Thu, 3 Jul 2025 12:46:05 +0000 Subject: [PATCH] disable make test because cannot find /lib/modules/`uname -r`/build add extramodules to depmod search path Signed-off-by: SuperSix173 (cherry picked from commit 3b99d828db58e2de920801490e14f8a85c7ef125) --- depmod.conf.dist | 2 +- kmod.changes | 8 ++++++-- kmod.spec | 5 +---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/depmod.conf.dist b/depmod.conf.dist index b9cb5e9..4b933c1 100644 --- a/depmod.conf.dist +++ b/depmod.conf.dist @@ -3,4 +3,4 @@ # # override default search ordering for kmod packaging -search updates extra external built-in weak-updates +search updates extra extramodules external built-in weak-updates diff --git a/kmod.changes b/kmod.changes index 93a0d8f..4b471c7 100644 --- a/kmod.changes +++ b/kmod.changes @@ -1,8 +1,12 @@ %changelog -* Thu Jul 07 2025 Liu Chao - 30-6 +* Thu Jul 03 2025 Liu Chao - 30-7 +- disable make test because cannot find /lib/modules/`uname -r`/build +- add extramodules to depmod search path + +* Thu Jul 03 2025 Liu Chao - 30-6 - backport community bugfix patches and enable make check -* Thu Jul 07 2025 Liu Chao - 30-5 +* Thu Jul 03 2025 Liu Chao - 30-5 - remove the obsolete kernel module replace feature * Tue May 07 2024 guoqinglan - 30-3 diff --git a/kmod.spec b/kmod.spec index f7dfdee..be8fb65 100644 --- a/kmod.spec +++ b/kmod.spec @@ -1,6 +1,6 @@ Name: kmod Version: 30 -Release: 6 +Release: 7 Summary: Kernel module management # GPLv2+ is used by programs, LGPLv2+ is used for libraries. License: GPLv2+ and LGPLv2+ @@ -90,9 +90,6 @@ mkdir -p $RPM_BUILD_ROOT/sbin install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/weak-modules install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d/dist.conf -%check -make check - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -- Gitee