From 109d2c93102049e7d7fdd5de7f9edff717224b32 Mon Sep 17 00:00:00 2001 From: Arvind Sankar Date: Fri, 19 Jun 2020 22:08:59 -0400 Subject: 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 Reviewed-by: Brian Behlendorf Signed-off-by: Arvind Sankar Closes #10493 --- module/Makefile.bsd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'module/Makefile.bsd') 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 -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 -- cgit v1.2.3