From: Timothy Day <timday@amazon.com>
Date: Thu, 3 Apr 2025 05:27:28 +0000 (-0400)
Subject: LU-18876 build: KMODEXT is always .ko
X-Git-Tag: 2.16.55~113
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F61%2F58661%2F3;p=fs%2Flustre-release.git

LU-18876 build: KMODEXT is always .ko

KMODEXT is always .ko, so let's remove it
to simplify the kernel Makefiles.

Test-Parameters: trivial
Signed-off-by: Timothy Day <timday@amazon.com>
Change-Id: I7e44849b8f77730cf112292d619116907661f52a
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/58661
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
---

diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4
index 519ddba..8666973 100644
--- a/config/lustre-build-linux.m4
+++ b/config/lustre-build-linux.m4
@@ -4,9 +4,6 @@
 # Set things accordingly for a linux kernel
 #
 AC_DEFUN([LB_LINUX_VERSION], [
-KMODEXT=".ko"
-AC_SUBST(KMODEXT)
-
 makerule="$PWD/build"
 AC_CACHE_CHECK([for external module build target], lb_cv_module_target,
 [
diff --git a/ldiskfs/autoMakefile.am b/ldiskfs/autoMakefile.am
index 487d50a..9644063 100644
--- a/ldiskfs/autoMakefile.am
+++ b/ldiskfs/autoMakefile.am
@@ -4,9 +4,9 @@ if MODULES
 if LDISKFS_ENABLED
 all-local: sources
 
-modulefs_DATA = ldiskfs$(KMODEXT)
+modulefs_DATA = ldiskfs.ko
 
-ldiskfs$(KMODEXT): sources
+ldiskfs.ko: sources
 endif
 endif
 
diff --git a/libcfs/libcfs/autoMakefile.am b/libcfs/libcfs/autoMakefile.am
index 809a6f1..3085190 100644
--- a/libcfs/libcfs/autoMakefile.am
+++ b/libcfs/libcfs/autoMakefile.am
@@ -31,7 +31,7 @@ libcfs_la_CFLAGS := -fPIC
 if MODULES
 
 if LINUX
-modulenet_DATA := libcfs$(KMODEXT)
+modulenet_DATA := libcfs.ko
 endif # LINUX
 
 endif # MODULES
diff --git a/lnet/klnds/gnilnd/autoMakefile.am b/lnet/klnds/gnilnd/autoMakefile.am
index e01b1df..e1d94bd 100644
--- a/lnet/klnds/gnilnd/autoMakefile.am
+++ b/lnet/klnds/gnilnd/autoMakefile.am
@@ -10,7 +10,7 @@
 
 if MODULES
 if BUILD_GNILND
-modulenet_DATA = kgnilnd$(KMODEXT)
+modulenet_DATA = kgnilnd.ko
 endif
 endif
 
diff --git a/lnet/klnds/in-kernel-o2iblnd/autoMakefile.am b/lnet/klnds/in-kernel-o2iblnd/autoMakefile.am
index c5db31c..716b01e 100644
--- a/lnet/klnds/in-kernel-o2iblnd/autoMakefile.am
+++ b/lnet/klnds/in-kernel-o2iblnd/autoMakefile.am
@@ -11,19 +11,19 @@
 
 if MODULES
 if BUILT_IN_KO2IBLND
-modulenet_DATA = in-kernel-ko2iblnd$(KMODEXT)
-ko2iblnd$(KMODEXT): sources
-in-kernel-ko2iblnd$(KMODEXT): ko2iblnd$(KMODEXT)
-	 cp -vf ko2iblnd$(KMODEXT) in-kernel-ko2iblnd$(KMODEXT)
+modulenet_DATA = in-kernel-ko2iblnd.ko
+ko2iblnd.ko: sources
+in-kernel-ko2iblnd.ko: ko2iblnd.ko
+	 cp -vf ko2iblnd.ko in-kernel-ko2iblnd.ko
 
 if EXTERNAL_KO2IBLND
 else
 install-exec-hook:
 	(cd "$(DESTDIR)$(modulenetdir)"; \
-	 $(LN_S) -f in-kernel-ko2iblnd$(KMODEXT) ko2iblnd$(KMODEXT))
+	 $(LN_S) -f in-kernel-ko2iblnd.ko ko2iblnd.ko)
 
 uninstall-hook:
-	(cd "$(DESTDIR)$(modulenetdir)"; rm -f ko2iblnd$(KMODEXT))
+	(cd "$(DESTDIR)$(modulenetdir)"; rm -f ko2iblnd.ko)
 endif
 endif
 endif
@@ -33,11 +33,11 @@ EXTRA_DIST = $(in-kernel-ko2iblnd-objs:%.o=%.c) o2iblnd-idl.h o2iblnd.h
 
 if MODULES
 if BUILT_IN_KO2IBLND
-all-local: $(in-kernel-ko2iblnd_headers) $(in-kernel-ko2iblnd_sources) in-kernel-ko2iblnd$(KMODEXT)
+all-local: $(in-kernel-ko2iblnd_headers) $(in-kernel-ko2iblnd_sources) in-kernel-ko2iblnd.ko
 endif
 endif
 
 CLEANFILES = $(in-kernel-ko2iblnd_headers) $(in-kernel-ko2iblnd_sources)
 
 clean-local:
-	rm -rf $(in-kernel-ko2iblnd_headers) $(in-kernel-ko2iblnd_sources) ko2iblnd$(KMODEXT) in-kernel-ko2iblnd$(KMODEXT)
+	rm -rf $(in-kernel-ko2iblnd_headers) $(in-kernel-ko2iblnd_sources) ko2iblnd.ko in-kernel-ko2iblnd.ko
diff --git a/lnet/klnds/kfilnd/autoMakefile.am b/lnet/klnds/kfilnd/autoMakefile.am
index 37ca870..7b6dfd7 100644
--- a/lnet/klnds/kfilnd/autoMakefile.am
+++ b/lnet/klnds/kfilnd/autoMakefile.am
@@ -6,7 +6,7 @@
 
 if MODULES
 if BUILD_KFILND
-modulenet_DATA := kkfilnd$(KMODEXT)
+modulenet_DATA := kkfilnd.ko
 endif # BUILD_KFILND
 endif # MODULES
 
diff --git a/lnet/klnds/o2iblnd/autoMakefile.am b/lnet/klnds/o2iblnd/autoMakefile.am
index c5c8c7e..aa98c21 100644
--- a/lnet/klnds/o2iblnd/autoMakefile.am
+++ b/lnet/klnds/o2iblnd/autoMakefile.am
@@ -11,7 +11,7 @@
 
 if MODULES
 if EXTERNAL_KO2IBLND
-modulenet_DATA = ko2iblnd$(KMODEXT)
+modulenet_DATA = ko2iblnd.ko
 endif
 endif
 
diff --git a/lnet/klnds/socklnd/autoMakefile.am b/lnet/klnds/socklnd/autoMakefile.am
index 4703d2d..2dfe5d2 100644
--- a/lnet/klnds/socklnd/autoMakefile.am
+++ b/lnet/klnds/socklnd/autoMakefile.am
@@ -5,7 +5,7 @@
 #
 
 if MODULES
-modulenet_DATA := ksocklnd$(KMODEXT)
+modulenet_DATA := ksocklnd.ko
 endif # MODULES
 
 EXTRA_DIST := $(ksocklnd-objs:%.o=%.c) socklnd.h
diff --git a/lnet/lnet/autoMakefile.am b/lnet/lnet/autoMakefile.am
index 026ff7f..1680671 100644
--- a/lnet/lnet/autoMakefile.am
+++ b/lnet/lnet/autoMakefile.am
@@ -7,7 +7,7 @@
 if MODULES
 
 if LINUX
-modulenet_DATA = lnet$(KMODEXT)
+modulenet_DATA = lnet.ko
 endif # LINUX
 
 endif # MODULES
diff --git a/lnet/selftest/autoMakefile.am b/lnet/selftest/autoMakefile.am
index 7fc6d3b..53b7e69 100644
--- a/lnet/selftest/autoMakefile.am
+++ b/lnet/selftest/autoMakefile.am
@@ -7,7 +7,7 @@
 if MODULES
 
 if LINUX
-modulenet_DATA = lnet_selftest$(KMODEXT)
+modulenet_DATA = lnet_selftest.ko
 endif # LINUX
 
 endif # MODULES
diff --git a/lustre/ec/autoMakefile.am b/lustre/ec/autoMakefile.am
index 1586264..10ccc18 100644
--- a/lustre/ec/autoMakefile.am
+++ b/lustre/ec/autoMakefile.am
@@ -30,7 +30,7 @@
 #
 
 if MODULES
-modulefs_DATA = ec$(KMODEXT)
+modulefs_DATA = ec.ko
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
diff --git a/lustre/fid/autoMakefile.am b/lustre/fid/autoMakefile.am
index 5132fff..346daf5 100644
--- a/lustre/fid/autoMakefile.am
+++ b/lustre/fid/autoMakefile.am
@@ -12,7 +12,7 @@
 #
 
 if MODULES
-modulefs_DATA = fid$(KMODEXT)
+modulefs_DATA = fid.ko
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
diff --git a/lustre/fld/autoMakefile.am b/lustre/fld/autoMakefile.am
index 27a60af..fb6fcc5 100644
--- a/lustre/fld/autoMakefile.am
+++ b/lustre/fld/autoMakefile.am
@@ -10,7 +10,7 @@
 #
 
 if MODULES
-modulefs_DATA = fld$(KMODEXT)
+modulefs_DATA = fld.ko
 endif # MODULES
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
diff --git a/lustre/kunit/autoMakefile.am b/lustre/kunit/autoMakefile.am
index 27cf4f1..dfb9a54 100644
--- a/lustre/kunit/autoMakefile.am
+++ b/lustre/kunit/autoMakefile.am
@@ -9,11 +9,11 @@
 #
 
 if MODULES
-modulefs_DATA = kinode$(KMODEXT)
-modulefs_DATA += obd_test$(KMODEXT)
+modulefs_DATA = kinode.ko
+modulefs_DATA += obd_test.ko
 if SERVER
-modulefs_DATA += ldlm_extent$(KMODEXT)
-modulefs_DATA += llog_test$(KMODEXT)
+modulefs_DATA += ldlm_extent.ko
+modulefs_DATA += llog_test.ko
 endif # SERVER
 endif # MODULES
 
diff --git a/lustre/lfsck/autoMakefile.am b/lustre/lfsck/autoMakefile.am
index 8d92910..f02e13b 100644
--- a/lustre/lfsck/autoMakefile.am
+++ b/lustre/lfsck/autoMakefile.am
@@ -5,7 +5,7 @@
 #
 
 if MODULES
-modulefs_DATA = lfsck$(KMODEXT)
+modulefs_DATA = lfsck.ko
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
diff --git a/lustre/llite/autoMakefile.am b/lustre/llite/autoMakefile.am
index 88bca67..5cb0ee3 100644
--- a/lustre/llite/autoMakefile.am
+++ b/lustre/llite/autoMakefile.am
@@ -10,7 +10,7 @@
 #
 
 if MODULES
-modulefs_DATA = lustre$(KMODEXT)
+modulefs_DATA = lustre.ko
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
diff --git a/lustre/lmv/autoMakefile.am b/lustre/lmv/autoMakefile.am
index cf19937..14d05ae 100644
--- a/lustre/lmv/autoMakefile.am
+++ b/lustre/lmv/autoMakefile.am
@@ -12,7 +12,7 @@
 #
 
 if MODULES
-modulefs_DATA = lmv$(KMODEXT)
+modulefs_DATA = lmv.ko
 endif # MODULES
 
 EXTRA_DIST = $(lmv-objs:.o=.c) lmv_internal.h
diff --git a/lustre/lod/autoMakefile.am b/lustre/lod/autoMakefile.am
index b2a3719..f3d9d0f 100644
--- a/lustre/lod/autoMakefile.am
+++ b/lustre/lod/autoMakefile.am
@@ -12,7 +12,7 @@
 #
 
 if MODULES
-modulefs_DATA = lod$(KMODEXT)
+modulefs_DATA = lod.ko
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
diff --git a/lustre/lov/autoMakefile.am b/lustre/lov/autoMakefile.am
index be4a783..4f3f1f6 100644
--- a/lustre/lov/autoMakefile.am
+++ b/lustre/lov/autoMakefile.am
@@ -12,7 +12,7 @@
 #
 
 if MODULES
-modulefs_DATA = lov$(KMODEXT)
+modulefs_DATA = lov.ko
 endif # MODULES
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
diff --git a/lustre/mdc/autoMakefile.am b/lustre/mdc/autoMakefile.am
index d4d2a6a..3c0804d 100644
--- a/lustre/mdc/autoMakefile.am
+++ b/lustre/mdc/autoMakefile.am
@@ -10,7 +10,7 @@
 #
 
 if MODULES
-modulefs_DATA = mdc$(KMODEXT)
+modulefs_DATA = mdc.ko
 endif # MODULES
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
diff --git a/lustre/mdd/autoMakefile.am b/lustre/mdd/autoMakefile.am
index 74e7dd9..e939307 100644
--- a/lustre/mdd/autoMakefile.am
+++ b/lustre/mdd/autoMakefile.am
@@ -12,7 +12,7 @@
 #
 
 if MODULES
-modulefs_DATA = mdd$(KMODEXT)
+modulefs_DATA = mdd.ko
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
diff --git a/lustre/mdt/autoMakefile.am b/lustre/mdt/autoMakefile.am
index de65a63..41c7953 100644
--- a/lustre/mdt/autoMakefile.am
+++ b/lustre/mdt/autoMakefile.am
@@ -10,7 +10,7 @@
 #
 
 if MODULES
-modulefs_DATA = mdt$(KMODEXT)
+modulefs_DATA = mdt.ko
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
diff --git a/lustre/mgc/autoMakefile.am b/lustre/mgc/autoMakefile.am
index 43ed0f4..c378f7a 100644
--- a/lustre/mgc/autoMakefile.am
+++ b/lustre/mgc/autoMakefile.am
@@ -12,7 +12,7 @@
 #
 
 if MODULES
-modulefs_DATA = mgc$(KMODEXT)
+modulefs_DATA = mgc.ko
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
diff --git a/lustre/mgs/autoMakefile.am b/lustre/mgs/autoMakefile.am
index 863e256..5936d5c 100644
--- a/lustre/mgs/autoMakefile.am
+++ b/lustre/mgs/autoMakefile.am
@@ -10,7 +10,7 @@
 #
 
 if MODULES
-modulefs_DATA = mgs$(KMODEXT)
+modulefs_DATA = mgs.ko
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
diff --git a/lustre/obdclass/autoMakefile.am b/lustre/obdclass/autoMakefile.am
index cc80950..bc507b8 100644
--- a/lustre/obdclass/autoMakefile.am
+++ b/lustre/obdclass/autoMakefile.am
@@ -10,7 +10,7 @@
 
 if MODULES
 if LINUX
-modulefs_DATA = obdclass$(KMODEXT)
+modulefs_DATA = obdclass.ko
 endif # LINUX
 endif # MODULES
 
diff --git a/lustre/obdecho/autoMakefile.am b/lustre/obdecho/autoMakefile.am
index 9dd66fb..148e96c 100644
--- a/lustre/obdecho/autoMakefile.am
+++ b/lustre/obdecho/autoMakefile.am
@@ -14,7 +14,7 @@
 if MODULES
 
 if LINUX
-modulefs_DATA = obdecho$(KMODEXT)
+modulefs_DATA = obdecho.ko
 endif # LINUX
 
 endif # MODULES
diff --git a/lustre/ofd/autoMakefile.am b/lustre/ofd/autoMakefile.am
index d5c309b..f76e334 100644
--- a/lustre/ofd/autoMakefile.am
+++ b/lustre/ofd/autoMakefile.am
@@ -12,7 +12,7 @@
 #
 
 if MODULES
-modulefs_DATA = ofd$(KMODEXT)
+modulefs_DATA = ofd.ko
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
diff --git a/lustre/osc/autoMakefile.am b/lustre/osc/autoMakefile.am
index 65d67eb..64ebdaa 100644
--- a/lustre/osc/autoMakefile.am
+++ b/lustre/osc/autoMakefile.am
@@ -14,7 +14,7 @@
 if MODULES
 
 if LINUX
-modulefs_DATA = osc$(KMODEXT)
+modulefs_DATA = osc.ko
 endif # LINUX
 
 endif # MODULES
diff --git a/lustre/osd-ldiskfs/autoMakefile.am b/lustre/osd-ldiskfs/autoMakefile.am
index b9228a5..dfb5347 100644
--- a/lustre/osd-ldiskfs/autoMakefile.am
+++ b/lustre/osd-ldiskfs/autoMakefile.am
@@ -13,7 +13,7 @@
 
 if MODULES
 if LDISKFS_ENABLED
-modulefs_DATA = osd_ldiskfs$(KMODEXT)
+modulefs_DATA = osd_ldiskfs.ko
 endif
 endif
 
diff --git a/lustre/osd-zfs/autoMakefile.am b/lustre/osd-zfs/autoMakefile.am
index 8acc456..5407144 100644
--- a/lustre/osd-zfs/autoMakefile.am
+++ b/lustre/osd-zfs/autoMakefile.am
@@ -13,7 +13,7 @@
 
 if MODULES
 if ZFS_ENABLED
-modulefs_DATA = osd_zfs$(KMODEXT)
+modulefs_DATA = osd_zfs.ko
 endif
 endif
 
diff --git a/lustre/osp/autoMakefile.am b/lustre/osp/autoMakefile.am
index 04a5ece..0cf61d8 100644
--- a/lustre/osp/autoMakefile.am
+++ b/lustre/osp/autoMakefile.am
@@ -12,7 +12,7 @@
 #
 
 if MODULES
-modulefs_DATA = osp$(KMODEXT)
+modulefs_DATA = osp.ko
 endif
 
 MOSTLYCLEANFILES := @MOSTLYCLEANFILES@
diff --git a/lustre/ptlrpc/autoMakefile.am b/lustre/ptlrpc/autoMakefile.am
index 9c8b1c8..f278abe 100644
--- a/lustre/ptlrpc/autoMakefile.am
+++ b/lustre/ptlrpc/autoMakefile.am
@@ -14,7 +14,7 @@
 if MODULES
 
 if LINUX
-modulefs_DATA = ptlrpc$(KMODEXT)
+modulefs_DATA = ptlrpc.ko
 endif # LINUX
 
 endif # MODULES
diff --git a/lustre/ptlrpc/gss/autoMakefile.am b/lustre/ptlrpc/gss/autoMakefile.am
index f0a9846..ad1640c 100644
--- a/lustre/ptlrpc/gss/autoMakefile.am
+++ b/lustre/ptlrpc/gss/autoMakefile.am
@@ -10,7 +10,7 @@
 #
 
 if MODULES
-modulefs_DATA = ptlrpc_gss$(KMODEXT)
+modulefs_DATA = ptlrpc_gss.ko
 endif # MODULES
 
 EXTRA_DIST = *.c *.h
diff --git a/lustre/quota/autoMakefile.am b/lustre/quota/autoMakefile.am
index 608b6a9..632c781 100644
--- a/lustre/quota/autoMakefile.am
+++ b/lustre/quota/autoMakefile.am
@@ -12,7 +12,7 @@
 if MODULES
 if LINUX
 
-modulefs_DATA = lquota$(KMODEXT)
+modulefs_DATA = lquota.ko
 
 endif LINUX
 endif MODULES