diff options
| author | Matthew Thode <[email protected]> | 2018-10-17 14:06:05 -0500 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-10-17 12:06:05 -0700 |
| commit | 8d431940038c4a668abdac40b5853b269d49253e (patch) | |
| tree | d39a51d1224022ec55a92f16686295dcc7fa731c /copy-builtin | |
| parent | 2e55034471413fb668d0d910b2c083610b386127 (diff) | |
Allow copy-builtin to work with modified sources
`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 <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Matthew Thode <[email protected]>
Closes #8022
Closes #8025
Diffstat (limited to 'copy-builtin')
| -rwxr-xr-x | copy-builtin | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/copy-builtin b/copy-builtin index eaffbd2d2..1dcfcb961 100755 --- a/copy-builtin +++ b/copy-builtin @@ -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" |