jengelh/kmod
SHA256
1
0
Fork 0
forked from pool/kmod
Code Pull Requests Activity

Resolve failure run of kmod-testsuite-33

Browse Source
This commit is contained in:
Jan Engelhardt 2024-08-22 03:06:06 +02:00
parent 4144b41a16
commit c0d997b9f8
4 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
0001-testsuite-fix-path-for-test-user.patch Normal file
View File

@ -0,0 +1,31 @@
From 590074281e8463128ac92ed2640405cd05b10cb1 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 14 Aug 2024 09:58:16 +0200
Subject: [PATCH] testsuite: fix path for test-user
... as this just does not find its paths.
Closes: https://github.com/kmod-project/kmod/issues/69
Fixes: 9d1fb31 ("libkmod, depmod, modprobe: Make directory for kernel modules configurable")
Signed-off-by: Christian Hesse <mail@eworm.de>
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
---
testsuite/test-user.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/testsuite/test-user.c b/testsuite/test-user.c
index 97a4747..0db48c3 100644
--- a/testsuite/test-user.c
+++ b/testsuite/test-user.c
@@ -16,7 +16,7 @@
#include "testsuite.h"
#define TEST_USER_ROOTFS TESTSUITE_ROOTFS "test-user/"
-#define TEST_USER_KERNEL_DIR TEST_USER_ROOTFS "lib/modules/4.4.4/"
+#define TEST_USER_KERNEL_DIR TEST_USER_ROOTFS MODULE_DIRECTORY "/4.4.4/"
static const char *const test_user_config_paths[] = {
TEST_USER_ROOTFS "etc/modprobe.d",
--
2.46.0

1
kmod-testsuite.spec
View File

@ -40,6 +40,7 @@ Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
Patch6: 0012-modprobe-print-unsupported-status.patch Patch6: 0012-modprobe-print-unsupported-status.patch
Patch7: 0001-testsuite-fix-path-for-test-user.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets

1
kmod.changes
View File

@ -5,6 +5,7 @@ Wed Aug 21 21:19:38 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
* Add weak dependencies * Add weak dependencies
* Stop parsing .alias files from modprobe.d directories * Stop parsing .alias files from modprobe.d directories
- Delete no-stylesheet-download.patch (merged) - Delete no-stylesheet-download.patch (merged)
- Add 0001-testsuite-fix-path-for-test-user.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 4 15:13:53 UTC 2024 - Michal Suchanek <msuchanek@suse.de> Thu Apr 4 15:13:53 UTC 2024 - Michal Suchanek <msuchanek@suse.de>

1
kmod.spec
View File

@ -41,6 +41,7 @@ Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch
Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch
Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch
Patch6: 0012-modprobe-print-unsupported-status.patch Patch6: 0012-modprobe-print-unsupported-status.patch
Patch7: 0001-testsuite-fix-path-for-test-user.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: libopenssl-devel >= 1.1.0 BuildRequires: libopenssl-devel >= 1.1.0