mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-25 18:59:33 +03:00
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
This commit is contained in:
parent
9baf44bc17
commit
15d0411297
1
.gitignore
vendored
1
.gitignore
vendored
@ -28,6 +28,7 @@
|
||||
.libs
|
||||
.DS_Store
|
||||
modules.order
|
||||
Makefile
|
||||
|
||||
#
|
||||
# Top level generated files specific to this top level dir
|
||||
|
1
cmd/.gitignore
vendored
1
cmd/.gitignore
vendored
@ -1,3 +1,2 @@
|
||||
/Makefile
|
||||
/spl
|
||||
/splat
|
||||
|
1
include/.gitignore
vendored
1
include/.gitignore
vendored
@ -1 +0,0 @@
|
||||
/Makefile
|
1
lib/.gitignore
vendored
1
lib/.gitignore
vendored
@ -1 +0,0 @@
|
||||
/Makefile
|
1
module/.gitignore
vendored
1
module/.gitignore
vendored
@ -1,4 +1,3 @@
|
||||
/.tmp_versions
|
||||
/Makefile
|
||||
/Module.markers
|
||||
/Module.symvers
|
||||
|
1
module/spl/.gitignore
vendored
1
module/spl/.gitignore
vendored
@ -1 +0,0 @@
|
||||
/Makefile
|
1
module/splat/.gitignore
vendored
1
module/splat/.gitignore
vendored
@ -1 +0,0 @@
|
||||
/Makefile
|
1
scripts/.gitignore
vendored
1
scripts/.gitignore
vendored
@ -1 +0,0 @@
|
||||
/Makefile
|
Loading…
Reference in New Issue
Block a user