From acfc4944d0d6db114db9f2bb5401251c5bd767b6 Mon Sep 17 00:00:00 2001 From: Michael D Labriola Date: Tue, 20 Oct 2020 13:51:44 -0700 Subject: [PATCH] copy-builtin: remove .gitignore from KERNEL_DIR/include/zfs While it makes sense to make sure we don't control the generated zfs_gitrev.h in the zfs source tree, once we copy the module sources into a kernel source tree that's a problem. If you're keeping your zfs sources in a kernel tree on a branch, you want to commit all the required files. Signed-off-by: Michael D Labriola --- copy-builtin | 1 + 1 file changed, 1 insertion(+) diff --git a/copy-builtin b/copy-builtin index 1dcfcb961e..0afbd0e746 100755 --- a/copy-builtin +++ b/copy-builtin @@ -36,6 +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" for MODULE in "${MODULES[@]}" do