From: Richard Yao <ryao@cs.stonybrook.edu>
Date: Thu, 16 Aug 2012 18:55:42 +0000 (-0400)
Subject: Remove Makefile from non-toplevel .gitignore files
X-Git-Tag: zfs-0.8.0-rc1~152^2~365
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15d0411297113cb2681f5522ed373d4d37fcf132;p=zfs

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 00b8b1229..ee69117f2 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 1b34aca0a..754846b75 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 5fc607b9e..000000000
--- a/include/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Makefile
diff --git a/lib/.gitignore b/lib/.gitignore
deleted file mode 100644
index 5fc607b9e..000000000
--- a/lib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Makefile
diff --git a/module/.gitignore b/module/.gitignore
index 7a922a409..611c51c42 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 5fc607b9e..000000000
--- 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 5fc607b9e..000000000
--- a/module/splat/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Makefile
diff --git a/scripts/.gitignore b/scripts/.gitignore
deleted file mode 100644
index 5fc607b9e..000000000
--- a/scripts/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Makefile