From 2eb12c712b0ca6926d6faa02186507988b798c31 Mon Sep 17 00:00:00 2001 From: Georgy Yakovlev <168902+gyakovlev@users.noreply.github.com> Date: Tue, 12 Jan 2021 17:18:55 -0800 Subject: [PATCH] copy-builtin: handle missing .gitignore acfc4944d0d6db114db9f2bb5401251c5bd767b6 broke copy-builtin in release tarballs, because those do not contain .gitignore file. Adding -f to rm call will make it return 0 even if file does not exist. Signed-off-by: Georgy Yakovlev Closes #11456 --- copy-builtin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/copy-builtin b/copy-builtin index 84f469fef0..6a6eb1f369 100755 --- a/copy-builtin +++ b/copy-builtin @@ -36,7 +36,7 @@ rm -rf "$KERNEL_DIR/include/zfs" "$KERNEL_DIR/fs/zfs" cp --recursive include "$KERNEL_DIR/include/zfs" cp --recursive module "$KERNEL_DIR/fs/zfs" cp zfs_config.h "$KERNEL_DIR/include/zfs/" -rm "$KERNEL_DIR/include/zfs/.gitignore" +rm -f "$KERNEL_DIR/include/zfs/.gitignore" for MODULE in "${MODULES[@]}" do