diff options
| author | Arvind Sankar <[email protected]> | 2020-06-19 22:08:59 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2020-06-24 18:19:28 -0700 |
| commit | 109d2c93102049e7d7fdd5de7f9edff717224b32 (patch) | |
| tree | 08eeeb151b4ecbabe5e3617199da94762e7bdce6 /module | |
| parent | 33982eb24c615f78b8f6b5f54c6acb6c29cbf6e3 (diff) | |
Move zfs_gitrev.h to build directory
Currently an out-of-tree build does not work with read-only source
directory because zfs_gitrev.h can't be created. Move this file to the
build directory, which is more appropriate for a generated file, and
drop the dist-hook for zfs_gitrev.h. There is no need to distribute this
file since it will be regenerated as part of the compilation in any
case.
scripts/make_gitrev.sh tries to avoid updating zfs_gitrev.h if there has
been no change, however this doesn't cover the case when the source
directory is not in git: in that case zfs_gitrev.h gets overwritten even
though it's always "unknown". Simplify the logic to always write out a
new version of zfs_gitrev.h, compare against the old and overwrite only
if different. This is now simple enough to just include in the
Makefile, so drop the script.
Reviewed-by: Ryan Moeller <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Arvind Sankar <[email protected]>
Closes #10493
Diffstat (limited to 'module')
| -rw-r--r-- | module/Kbuild.in | 1 | ||||
| -rw-r--r-- | module/Makefile.bsd | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/module/Kbuild.in b/module/Kbuild.in index 120ce87c5..031b5a9a8 100644 --- a/module/Kbuild.in +++ b/module/Kbuild.in @@ -22,6 +22,7 @@ ZFS_MODULE_CFLAGS += @KERNEL_DEBUG_CFLAGS@ @NO_FORMAT_ZERO_LENGTH@ ifneq ($(KBUILD_EXTMOD),) zfs_include = @abs_top_srcdir@/include ZFS_MODULE_CFLAGS += -include @abs_top_builddir@/zfs_config.h +ZFS_MODULE_CFLAGS += -I@abs_top_builddir@/include else zfs_include = $(srctree)/include/zfs ZFS_MODULE_CFLAGS += -include $(zfs_include)/zfs_config.h diff --git a/module/Makefile.bsd b/module/Makefile.bsd index d23cacd36..a46b92051 100644 --- a/module/Makefile.bsd +++ b/module/Makefile.bsd @@ -4,7 +4,7 @@ WITH_CTF=1 .include <bsd.sys.mk> -SRCDIR= ${.CURDIR} +SRCDIR=${.CURDIR} INCDIR=${.CURDIR:H}/include KMOD= openzfs @@ -19,6 +19,7 @@ KMOD= openzfs ${SRCDIR}/zfs +CFLAGS+= -I${.OBJDIR:H}/include CFLAGS+= -I${INCDIR} CFLAGS+= -I${INCDIR}/spl CFLAGS+= -I${INCDIR}/os/freebsd |