diff --git a/0001-testsuite-fix-path-for-test-user.patch b/0001-testsuite-fix-path-for-test-user.patch new file mode 100644 index 0000000..e1081ab --- /dev/null +++ b/0001-testsuite-fix-path-for-test-user.patch @@ -0,0 +1,31 @@ +From 590074281e8463128ac92ed2640405cd05b10cb1 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +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 +Signed-off-by: Lucas De Marchi +--- + 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 + diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index f9daf3f..7d1ffd2 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1724275833 -commit: 4144b41a163a7a120e5f0c14e26b03c2afe99342da10cd873486d72354f9e133 +mtime: 1724288766 +commit: c0d997b9f87fef11b441dffd32addda660379ac46be324866950df1bb120bbfb url: https://src.opensuse.org/jengelh/kmod revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index e7c2682..8b54324 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa1cdddd8e4772411150022a4a0a63f09dc631cc601036b54f125add58e0ecbf +oid sha256:0c2048e2a949628d627588e8adc4dabbfab2220ec67d60d7969fb1b33fd4d429 size 256 diff --git a/kmod-testsuite.spec b/kmod-testsuite.spec index 5346e18..8428814 100644 --- a/kmod-testsuite.spec +++ b/kmod-testsuite.spec @@ -40,6 +40,7 @@ Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch Patch6: 0012-modprobe-print-unsupported-status.patch +Patch7: 0001-testsuite-fix-path-for-test-user.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: docbook-xsl-stylesheets diff --git a/kmod.changes b/kmod.changes index 158aec9..b553d06 100644 --- a/kmod.changes +++ b/kmod.changes @@ -5,6 +5,7 @@ Wed Aug 21 21:19:38 UTC 2024 - Jan Engelhardt * Add weak dependencies * Stop parsing .alias files from modprobe.d directories - 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 diff --git a/kmod.spec b/kmod.spec index c5e0b30..8df0217 100644 --- a/kmod.spec +++ b/kmod.spec @@ -41,6 +41,7 @@ Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch Patch6: 0012-modprobe-print-unsupported-status.patch +Patch7: 0001-testsuite-fix-path-for-test-user.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libopenssl-devel >= 1.1.0