From d6ab6b66a30fdbd96667814c46e4ef07813c7786 Mon Sep 17 00:00:00 2001 From: Shaun Tancheff Date: Tue, 13 Aug 2024 21:10:34 +0700 Subject: [PATCH] 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 Change-Id: Ic431a78f372c6388907d1cc5db3ab39973cf31f0 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/56386 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin Reviewed-by: James Simmons Reviewed-by: Timothy Day Reviewed-by: Petros Koutoupis --- debian/lustre-tests.install.in | 4 ++-- debian/rules | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/lustre-tests.install.in b/debian/lustre-tests.install.in index 6ff8b57..4d2721c 100644 --- 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 --- 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) \ ); \ -- 1.8.3.1