LU-18228 build: specify kmp-moddir

On debian 12 when packaging kernel integration test modules
the installed location needs to be well known.

Update debian/rules to specify kmp-moddir as well as adjust
the expected location of the kernel module.

HPE-bug-id: LUS-12444
Test-Parameters: trivial
Fixes: bac5e458ee ("LU-17096 debian: add obd_test.ko, llog_test.ko to lustre-tests")
Signed-off-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Change-Id: Ic431a78f372c6388907d1cc5db3ab39973cf31f0
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56386
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Timothy Day <timday@amazon.com>
Reviewed-by: Petros Koutoupis <petros.koutoupis@hpe.com>

diff --git a/debian/lustre-tests.install.in b/debian/lustre-tests.install.in
index 6ff8b57..4d2721c 100644 (file)
--- a/debian/lustre-tests.install.in
+++ b/debian/lustre-tests.install.in
@@ -1,5 +1,5 @@
-debian/tmp/lib/modules/_KVERS_/updates/kernel/fs/lustre/*_test.ko      usr/lib/modules/_KVERS_/updates/kernel/fs/lustre/
-debian/tmp/lib/modules/_KVERS_/updates/kernel/fs/lustre/kinode.ko      usr/lib/modules/_KVERS_/updates/kernel/fs/lustre/
+debian/tmp/lib/modules/_KVERS_/updates/kernel/fs/*_test.ko     usr/lib/modules/_KVERS_/updates/kernel/fs/lustre/
+debian/tmp/lib/modules/_KVERS_/updates/kernel/fs/kinode.ko     usr/lib/modules/_KVERS_/updates/kernel/fs/lustre/
 debian/tmp/usr/lib/lustre/tests/*      usr/lib/lustre/tests
 debian/tmp/usr/bin/mcreate             usr/bin
 debian/tmp/usr/bin/statx               usr/bin

diff --git a/debian/rules b/debian/rules
index b180856..3a06c4f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -283,6 +283,7 @@ configure-stamp: autogen-stamp debian/control.main debian/control.modules.in
                        --with-linux=$${KERNEL_SRC} \
                        --with-linux-obj=$${KERNEL_OBJ} \
                        --enable-quota \
+                       --with-kmp-moddir=updates/kernel \
                        $${EXTRAFLAGS} \
                        $(EXTRA_OPTIONS) \
        ); \