summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorRichard Yao <[email protected]>2012-08-16 14:55:42 -0400
committerBrian Behlendorf <[email protected]>2012-08-23 12:49:04 -0700
commit15d0411297113cb2681f5522ed373d4d37fcf132 (patch)
treed17097f77738fe36e223e261943bc0c735877e35 /.gitignore
parent9baf44bc17ddbc01dae4feacda32e04aac73f730 (diff)
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 <[email protected]> Signed-off-by: Richard Yao <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #152
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
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