Several changes in kbuild affect the way external modules
can be built. In the Linux 5.3-rc4 series subdir-m has
been removed.
Linux commit:
c07d8d47bca1b325102fa2be3a463075f7b051d9
Test-Parameters: trivial
Cray-bug-id: LUS-7689
Signed-off-by: Shaun Tancheff <stancheff@cray.com>
Change-Id: Id1f248ac4ccdee8d2a2d177b4fdff4444d2084d1
Reviewed-on: https://review.whamcloud.com/35786
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
# doxygen files
doxygen.*
+*.mod
-subdir-m += @LDISKFS_SUBDIR@ @LIBCFS_SUBDIR@ lnet
-subdir-m += lustre
+obj-m += @LDISKFS_SUBDIR@/ @LIBCFS_SUBDIR@/ lnet/
+obj-m += lustre/
@INCLUDE_RULES@
KBUILD_EXTRA_SYMBOLS += @EXTRA_SYMBOLS@
-obj-m := $(patsubst %,%.o,$(MODULES))
+obj-m += $(patsubst %,%.o,$(MODULES))
endif # PATCHLEVEL
-subdir-m += libcfs
+obj-m += libcfs/
@INCLUDE_RULES@
-lnet-subdirs += lnet
-lnet-subdirs += klnds
-lnet-subdirs += selftest
-subdir-m += $(lnet-subdirs)
+lnet-subdirs += lnet/
+lnet-subdirs += klnds/
+lnet-subdirs += selftest/
+obj-m += $(lnet-subdirs)
@INCLUDE_RULES@
-@BUILD_GNILND_TRUE@subdir-m += gnilnd
-@BUILD_O2IBLND_TRUE@subdir-m += o2iblnd
-subdir-m += socklnd
+@BUILD_GNILND_TRUE@obj-m += gnilnd/
+@BUILD_O2IBLND_TRUE@obj-m += o2iblnd/
+obj-m += socklnd/
@INCLUDE_RULES@
-subdir-m += fid
-subdir-m += obdclass
-subdir-m += ptlrpc
-subdir-m += obdecho
-subdir-m += mgc
-subdir-m += tests/kernel
+obj-m += fid/
+obj-m += obdclass/
+obj-m += ptlrpc/
+obj-m += obdecho/
+obj-m += mgc/
+obj-m += tests/kernel/
-@SERVER_TRUE@subdir-m += ost mgs mdt mdd ofd quota osp lod lfsck
-@CLIENT_TRUE@subdir-m += lov osc mdc lmv llite fld
-@LDISKFS_ENABLED_TRUE@subdir-m += osd-ldiskfs
-@ZFS_ENABLED_TRUE@subdir-m += osd-zfs
+@SERVER_TRUE@obj-m += ost/ mgs/ mdt/ mdd/ ofd/ quota/ osp/ lod/ lfsck/
+@CLIENT_TRUE@obj-m += lov/ osc/ mdc/ lmv/ llite/ fld/
+@LDISKFS_ENABLED_TRUE@obj-m += osd-ldiskfs/
+@ZFS_ENABLED_TRUE@obj-m += osd-zfs/
@OSDADDON@
@INCLUDE_RULES@
OSDADDON=""
], [ln -s $OSDADDON $LUSTRE/$OSDMODNAME], [
AC_MSG_RESULT([$OSDMODNAME])
- OSDADDON="subdir-m += $OSDMODNAME"
+ OSDADDON="obj-m += $OSDMODNAME/"
], [
AC_MSG_RESULT([can't link])
OSDADDON=""
ptlrpc-objs := $(ldlm_objs) $(ptlrpc_objs) $(TARGET)barrier.o
@SERVER_TRUE@ptlrpc-objs += $(target_objs) $(nodemap_objs)
-@GSS_TRUE@subdir-m += gss
+@GSS_TRUE@obj-m += gss/
default: all