From 15d0411297113cb2681f5522ed373d4d37fcf132 Mon Sep 17 00:00:00 2001 From: Richard Yao Date: Thu, 16 Aug 2012 14:55:42 -0400 Subject: [PATCH] Remove Makefile from non-toplevel .gitignore files When building SPL support into the kernel, ./copy-builtin will copy non-toplevel .gitignore files. These files list /Makefile, which causes git-archive to omit ./module/{spl,splat}/Makefile. The absence of these files result in build failures when SPL is selected. ZFS is unaffected because it puts Makefile in the toplevel .gitignore, which is not copied. We fix SPL by emulating that behavior. Reported-by: Fabio Erculiani Signed-off-by: Richard Yao Signed-off-by: Brian Behlendorf Closes #152 --- .gitignore | 1 + cmd/.gitignore | 1 - include/.gitignore | 1 - lib/.gitignore | 1 - module/.gitignore | 1 - module/spl/.gitignore | 1 - module/splat/.gitignore | 1 - scripts/.gitignore | 1 - 8 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 include/.gitignore delete mode 100644 lib/.gitignore delete mode 100644 module/spl/.gitignore delete mode 100644 module/splat/.gitignore delete mode 100644 scripts/.gitignore diff --git a/.gitignore b/.gitignore index 00b8b12298..ee69117f29 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ .libs .DS_Store modules.order +Makefile # # Top level generated files specific to this top level dir diff --git a/cmd/.gitignore b/cmd/.gitignore index 1b34aca0a7..754846b75d 100644 --- a/cmd/.gitignore +++ b/cmd/.gitignore @@ -1,3 +1,2 @@ -/Makefile /spl /splat diff --git a/include/.gitignore b/include/.gitignore deleted file mode 100644 index 5fc607b9e2..0000000000 --- a/include/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/Makefile diff --git a/lib/.gitignore b/lib/.gitignore deleted file mode 100644 index 5fc607b9e2..0000000000 --- a/lib/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/Makefile diff --git a/module/.gitignore b/module/.gitignore index 7a922a4092..611c51c426 100644 --- a/module/.gitignore +++ b/module/.gitignore @@ -1,4 +1,3 @@ /.tmp_versions -/Makefile /Module.markers /Module.symvers diff --git a/module/spl/.gitignore b/module/spl/.gitignore deleted file mode 100644 index 5fc607b9e2..0000000000 --- a/module/spl/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/Makefile diff --git a/module/splat/.gitignore b/module/splat/.gitignore deleted file mode 100644 index 5fc607b9e2..0000000000 --- a/module/splat/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/Makefile diff --git a/scripts/.gitignore b/scripts/.gitignore deleted file mode 100644 index 5fc607b9e2..0000000000 --- a/scripts/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/Makefile