c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-26 04:07:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Allow copy-builtin to work with modified sources

Browse Source 
`scripts/make_gitrev.sh` had 'set -e' so if any command failed it would
fail and cause copy-builtin to fail (copy-builtin also has `set -e`.
This commit also simplifies scripts/make_gitrev.sh to always write a
file by using a cleanup function.  It also simplifies other areas of
the script as well (making it much shorter).

Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Matthew Thode <mthode@mthode.org>
Closes #8022 
Closes #8025
This commit is contained in:
Matthew Thode
2018-10-17 14:06:05 -05:00
committed by Brian Behlendorf
parent 2e55034471
commit 8d43194003
2 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
copy-builtin
+1 -1
View File
@@ -30,7 +30,7 @@ then
fi
make clean || true
scripts/make_gitrev.sh
scripts/make_gitrev.sh || true
rm -rf "$KERNEL_DIR/include/zfs" "$KERNEL_DIR/fs/zfs"
cp --recursive include "$KERNEL_DIR/include/zfs"