-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Create /proc/sys/kernel/spl/gitrev with git hash
The existing mechanisms for determining what code is running in the kernel do not always correctly report the git hash. The versions reported there do not reflect changes made since `configure` was run (i.e. incremental builds do not update the version) and they are misleading if git tags are not set up properly. This applies to `modinfo zfs`, `dmesg`, and `/sys/module/zfs/version`. There are complicated requirements on how the existing version is generated. Therefore we are leaving that alone, and adding a new mechanism to record and retrieve the git hash: `cat /proc/sys/kernel/spl/gitrev` The gitrev is re-generated at compile time, when running `make` (including for incremental builds). The value is the output of `git describe` (or "unknown" if not in a git repo or there are uncommitted changes). We're also removing /proc/sys/kernel/spl/version, which was never very useful. Reviewed by: Pavel Zakharov <pavel.zakharov@delphix.com> Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed by: Tim Chase <tim@chase2k.com> Signed-off-by: Matthew Ahrens <mahrens@delphix.com> Closes #7931 Closes #7965
- zfs-2.3.99
- zfs-2.3.0-rc4
- zfs-2.3.0-rc3
- zfs-2.3.0-rc2
- zfs-2.3.0-rc1
- zfs-2.2.99
- zfs-2.2.7
- zfs-2.2.6
- zfs-2.2.5
- zfs-2.2.4
- zfs-2.2.3
- zfs-2.2.2
- zfs-2.2.1
- zfs-2.2.0
- zfs-2.2.0-rc5
- zfs-2.2.0-rc4
- zfs-2.2.0-rc3
- zfs-2.2.0-rc2
- zfs-2.2.0-rc1
- zfs-2.1.99
- zfs-2.1.16
- zfs-2.1.15
- zfs-2.1.14
- zfs-2.1.13
- zfs-2.1.12
- zfs-2.1.11
- zfs-2.1.10
- zfs-2.1.9
- zfs-2.1.8
- zfs-2.1.7
- zfs-2.1.6
- zfs-2.1.5
- zfs-2.1.4
- zfs-2.1.3
- zfs-2.1.2
- zfs-2.1.1
- zfs-2.1.0
- zfs-2.1.0-rc8
- zfs-2.1.0-rc7
- zfs-2.1.0-rc6
- zfs-2.1.0-rc5
- zfs-2.1.0-rc4
- zfs-2.1.0-rc3
- zfs-2.1.0-rc2
- zfs-2.1.0-rc1
- zfs-2.0.7
- zfs-2.0.6
- zfs-2.0.5
- zfs-2.0.4
- zfs-2.0.3
- zfs-2.0.2
- zfs-2.0.1
- zfs-2.0.0
- zfs-2.0.0-rc7
- zfs-2.0.0-rc6
- zfs-2.0.0-rc5
- zfs-2.0.0-rc4
- zfs-2.0.0-rc3
- zfs-2.0.0-rc2
- zfs-2.0.0-rc1
- zfs-0.8.6
- zfs-0.8.5
- zfs-0.8.4
- zfs-0.8.3
- zfs-0.8.2
- zfs-0.8.1
- zfs-0.8.0
- zfs-0.8.0-rc5
- zfs-0.8.0-rc4
- zfs-0.8.0-rc3
- zfs-0.8.0-rc2
1 parent
dfbe267
commit 4cbde2e
Showing
9 changed files
with
74 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
/zfs_gitrev.h |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
#!/bin/sh | ||
|
||
# | ||
# CDDL HEADER START | ||
# | ||
# This file and its contents are supplied under the terms of the | ||
# Common Development and Distribution License ("CDDL"), version 1.0. | ||
# You may only use this file in accordance with the terms of version | ||
# 1.0 of the CDDL. | ||
# | ||
# A full copy of the text of the CDDL should have accompanied this | ||
# source. A copy of the CDDL is also available via the Internet at | ||
# http://www.illumos.org/license/CDDL. | ||
# | ||
# CDDL HEADER END | ||
# | ||
|
||
# | ||
# Copyright (c) 2018 by Delphix. All rights reserved. | ||
# | ||
|
||
# | ||
# Generate zfs_gitrev.h. Note that we need to do this for every | ||
# invocation of `make`, including for incremental builds. Therefore we | ||
# can't use a zfs_gitrev.h.in file which would be processed only when | ||
# `configure` is run. | ||
# | ||
|
||
BASE_DIR=$(dirname "$0") | ||
|
||
file=${BASE_DIR}/../include/zfs_gitrev.h | ||
|
||
# | ||
# Set default file contents in case we bail. | ||
# | ||
rm -f "$file" | ||
# shellcheck disable=SC2039 | ||
/bin/echo -e "#define\tZFS_META_GITREV \"unknown\"" >>"$file" | ||
|
||
# | ||
# Check if git is installed and we are in a git repo. | ||
# | ||
git rev-parse --git-dir > /dev/null 2>&1 || exit | ||
|
||
# | ||
# Check if there are uncommitted changes | ||
# | ||
git diff-index --quiet HEAD || exit | ||
|
||
rev=$(git describe 2>/dev/null) || exit | ||
|
||
rm -f "$file" | ||
# shellcheck disable=SC2039 | ||
/bin/echo -e "#define\tZFS_META_GITREV \"${rev}\"" >>"$file" |