From 3e0988996417963322a6fab487460de21a0d14b8 Mon Sep 17 00:00:00 2001 From: Shaun Tancheff Date: Fri, 28 Feb 2025 10:28:52 +0700 Subject: [PATCH] LU-18760 dkms: race on clobber and create of modules.order DKMS builds fail occasionally with an error: cat: /var/lib/dkms/.../build//modules.order: No such file or directory MODPOST /var/lib/dkms/.../build/Module.symvers This appears to be a make bug trying where a path with // is not understood correctly. Remove the unnecessary injection of / in the list of SUBDIRS to be built in when ldiskfs is not enabled. Test-Parameters: trivial HPE-bug-id: LUS-12672 Signed-off-by: Shaun Tancheff Change-Id: I6dda02133115076b076e6adf2ebabd10895af643 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/58261 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Caleb Carlson Reviewed-by: Jian Yu Reviewed-by: Petros Koutoupis Reviewed-by: Oleg Drokin --- Makefile.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 95650e8..6d3e3fe 100644 --- a/Makefile.in +++ b/Makefile.in @@ -8,7 +8,10 @@ # Template to generate top-level Makefile # -obj-m += @LDISKFS_SUBDIR@/ libcfs/ lnet/ +ifneq (@LDISKFS_SUBDIR@,) +obj-m += @LDISKFS_SUBDIR@/ +endif +obj-m += libcfs/ lnet/ obj-m += lustre/ @INCLUDE_RULES@ -- 1.8.3.1