[LU-17587] lustre-client dkms build is partially broken

• Type: Bug
• Resolution: Fixed
• Priority: Minor
• Fix Version/s: Lustre 2.16.0, Lustre 2.15.5
• Severity: 3
• Assignee: Shane Nehring
• Reporter: Shane Nehring

Description

The dkms build for lustre-client is partially broken. It will always build the module against the running version of the kernel, not the version specified by dkms. The fix seems to be pretty easy:

diff --git a/lustre-dkms_pre-build.sh b/lustre-dkms_pre-build.sh
index ce298cb763..54f9cc40af 100755
--- a/lustre-dkms_pre-build.sh
+++ b/lustre-dkms_pre-build.sh
@@ -22,7 +22,7 @@
 case $1 in
     lustre-client)
        SERVER="--disable-server"
-       KERNEL_STUFF=""
+       KERNEL_STUFF="--with-linux=$4 --with-linux-obj=$4"
        ;;
 
     lustre-zfs|lustre-all)

Comments

[Gerrit Updater]

"Oleg Drokin <[e-mail]>" merged in patch https://review.whamcloud.com/c/fs/lustre-release/+/54965/
Subject: LU-17587 build: use kernel version from dkms for client
Project: fs/lustre-release
Branch: b2_15
Current Patch Set:
Commit: c30a6d47c882e0278b4c5090ed72369a43eac425

[Peter Jones]

I think that these are likely known occasional failures unrelated to your change. I've retriggered the tests so let's see what happens...

[Shane Nehring]

I don't have access to the testing system, so I'm not sure what the build failures are about.

[Shane Nehring]

Cherry picked on top of b2_15. I had a conflict with the deprecated REMAKE_INITRD option in dkms.mkconf which ultimately had me disabling the commit-msg hook to get it to --continue because it wouldn't recognize my sign off line. Hopefully that didn't mess up too much.

[Gerrit Updater]

"snehring <[e-mail]>" uploaded a new patch: https://review.whamcloud.com/c/fs/lustre-release/+/54965
Subject: LU-17587 build: use kernel version from dkms for client
Project: fs/lustre-release
Branch: b2_15
Current Patch Set: 1
Commit: dc96cd81ee437bc1c8eec21271bf30c9a2ccfd93

[Peter Jones]

Merged for 2.16

[Gerrit Updater]

"Oleg Drokin <[e-mail]>" merged in patch https://review.whamcloud.com/c/fs/lustre-release/+/54830/
Subject: LU-17587 build: use kernel version from dkms for client
Project: fs/lustre-release
Branch: master
Current Patch Set:
Commit: aa76ae0c21a7e315ecb1fded82f2c793aa26f78c

[Peter Jones]

By all means you could push it to b2_15 also but it would probably be best to finalize the patch on master before doing so.

[Shane Nehring]

If I wanted this to get into the next 2_15 release should I also push that to b2_15 or would that normally get sorted via another process after this change is accepted into master?

[Gerrit Updater]

"snehring <[e-mail]>" uploaded a new patch: https://review.whamcloud.com/c/fs/lustre-release/+/54830
Subject: LU-17587 build: use kernel version from dkms for client
Project: fs/lustre-release
Branch: master
Current Patch Set: 1
Commit: 2d217a710b5ae005a2ebb85eb5594e8acdefdca4