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 <lxnay@gentoo.org>
Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #152

diff --git a/.gitignore b/.gitignore
index 00b8b122984af3d9b2bc4c25545ffde56bd6771b..ee69117f2909ed869b91d08a21d98b0518078198 100644 (file)
--- 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 1b34aca0a7cb4a7075e27bf3137f35203deee8f1..754846b75d70e4c1cc3787ea92b0195af103e660 100644 (file)
--- 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 (file)
index 5fc607b..0000000
--- a/include/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Makefile

diff --git a/lib/.gitignore b/lib/.gitignore
deleted file mode 100644 (file)
index 5fc607b..0000000
--- a/lib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Makefile

diff --git a/module/.gitignore b/module/.gitignore
index 7a922a40927ed5e45e054349d2cd076d0342c733..611c51c426eb1606343009b7c70d6ccd3ae5ece5 100644 (file)
--- 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 (file)
index 5fc607b..0000000
--- a/module/spl/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Makefile

diff --git a/module/splat/.gitignore b/module/splat/.gitignore
deleted file mode 100644 (file)
index 5fc607b..0000000
--- a/module/splat/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Makefile

diff --git a/scripts/.gitignore b/scripts/.gitignore
deleted file mode 100644 (file)
index 5fc607b..0000000
--- a/scripts/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Makefile