more

openzfs · Oct 2, 2018 · f3dae3e · f3dae3e
1 parent be95f25
commit f3dae3e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -46,7 +46,7 @@ distclean-local::
 all-local:
 	-${top_srcdir}/scripts/zfs-tests.sh -c
 
-dist-hook:
+dist-hook: gitrev
 	sed -i 's/Release:[[:print:]]*/Release:      $(RELEASE)/' \
 		$(distdir)/META
 

diff --git a/include/spl/sys/.gitignore → include/.gitignore b/include/spl/sys/.gitignore → include/.gitignore
diff --git a/module/spl/spl-generic.c b/module/spl/spl-generic.c
@@ -45,7 +45,7 @@
 #include <sys/random.h>
 #include <sys/strings.h>
 #include <linux/kmod.h>
-#include <sys/zfs_gitrev.h>
+#include "zfs_gitrev.h"
 
 char spl_gitrev[64] = ZFS_META_GITREV;
 

diff --git a/module/zfs/spa_history.c b/module/zfs/spa_history.c
@@ -38,6 +38,7 @@
 #include <sys/sunddi.h>
 #include <sys/cred.h>
 #include "zfs_comutil.h"
+#include "zfs_gitrev.h"
 #ifdef _KERNEL
 #include <sys/zone.h>
 #endif
@@ -617,8 +618,8 @@ spa_history_log_version(spa_t *spa, const char *operation, dmu_tx_t *tx)
 	utsname_t *u = utsname();
 
 	spa_history_log_internal(spa, operation, tx,
-	    "pool version %llu; software version %llu/%llu; uts %s %s %s %s",
-	    (u_longlong_t)spa_version(spa), SPA_VERSION, ZPL_VERSION,
+	    "pool version %llu; software version %s; uts %s %s %s %s",
+	    (u_longlong_t)spa_version(spa), ZFS_META_GITREV,
 	    u->nodename, u->release, u->version, u->machine);
 }
 

diff --git a/scripts/make_gitrev.sh b/scripts/make_gitrev.sh
@@ -28,7 +28,8 @@
 
 BASE_DIR=$(dirname "$0")
 
-file=${BASE_DIR}/../include/spl/sys/zfs_gitrev.h
+#file=${BASE_DIR}/../include/spl/sys/zfs_gitrev.h
+file=${BASE_DIR}/../include/zfs_gitrev.h
 
 #
 # Set default file contents in case we bail.