diff options
| author | Arvind Sankar <[email protected]> | 2020-06-07 17:03:12 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2020-06-10 09:24:15 -0700 |
| commit | 71504277ae5537007a99864e53a3b5ceb211a660 (patch) | |
| tree | 7bd3dacc2432c27ce0a60516c795a38477adcfd8 /module/nvpair | |
| parent | dd4bc569b9f73e8c2445bed90d82c92d98aada03 (diff) | |
Cleanup linux module kbuild files
The linux module can be built either as an external module, or compiled
into the kernel, using copy-builtin. The source and build directories
are slightly different between the two cases, and currently, compiling
into the kernel still refers to some files from the configured ZFS
source tree, instead of the copies inside the kernel source tree. There
is also duplication between copy-builtin, which creates a Kbuild file to
build ZFS inside the kernel tree, and the top-level module/Makefile.in.
Fix this by moving the list of modules and the CFLAGS settings into a
new module/Kbuild.in, which will be used by the kernel kbuild
infrastructure, and using KBUILD_EXTMOD to distinguish the two cases
within the Makefiles, in order to choose appropriate include
directories etc.
Module CFLAGS setting is simplified by using subdir-ccflags-y (available
since 2.6.30) to set them in the top-level Kbuild instead of each
individual module. The disabling of -Wunused-but-set-variable is removed
from the lua and zfs modules. The variable that the Makefile uses is
actually not defined, so this has no effect; and the warning has long
been disabled by the kernel Makefile itself.
The target_cpu definition in module/{zfs,zcommon} is removed as it was
replaced by use of CONFIG_SPARC64 in
commit 70835c5b755e ("Unify target_cpu handling")
os/linux/{spl,zfs} are removed from obj-m, as they are not modules in
themselves, but are included by the Makefile in the spl and zfs module
directories. The vestigial Makefiles in os and os/linux are removed.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Arvind Sankar <[email protected]>
Closes #10379
Closes #10421
Diffstat (limited to 'module/nvpair')
| -rw-r--r-- | module/nvpair/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/module/nvpair/Makefile.in b/module/nvpair/Makefile.in index f420ef98b..d81452366 100644 --- a/module/nvpair/Makefile.in +++ b/module/nvpair/Makefile.in @@ -1,12 +1,12 @@ -src = @abs_top_srcdir@/module/nvpair +ifneq ($(KBUILD_EXTMOD),) +src = @abs_srcdir@ obj = @abs_builddir@ +endif MODULE := znvpair obj-$(CONFIG_ZFS) := $(MODULE).o -ccflags-y := $(ZFS_MODULE_CFLAGS) $(ZFS_MODULE_CPPFLAGS) - $(MODULE)-objs += nvpair.o $(MODULE)-objs += fnvpair.o $(MODULE)-objs += nvpair_alloc_spl.o |