From 707c8e84a99e6f8603d8c8e1aa4a96c8c67dce6a Mon Sep 17 00:00:00 2001 From: Matthew Ahrens Date: Wed, 3 Oct 2018 13:33:52 -0700 Subject: [PATCH] fix --- copy-builtin | 1 + scripts/make_gitrev.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/copy-builtin b/copy-builtin index 8be8b4381b37..eaffbd2d26ec 100755 --- a/copy-builtin +++ b/copy-builtin @@ -30,6 +30,7 @@ then fi make clean || true +scripts/make_gitrev.sh rm -rf "$KERNEL_DIR/include/zfs" "$KERNEL_DIR/fs/zfs" cp --recursive include "$KERNEL_DIR/include/zfs" diff --git a/scripts/make_gitrev.sh b/scripts/make_gitrev.sh index a3e3ffebbf6b..04be09595ccc 100755 --- a/scripts/make_gitrev.sh +++ b/scripts/make_gitrev.sh @@ -34,6 +34,7 @@ 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" # @@ -49,4 +50,5 @@ 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"