diff options
| author | Richard Yao <[email protected]> | 2012-08-16 14:55:42 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2012-08-23 12:49:04 -0700 |
| commit | 15d0411297113cb2681f5522ed373d4d37fcf132 (patch) | |
| tree | d17097f77738fe36e223e261943bc0c735877e35 | |
| parent | 9baf44bc17ddbc01dae4feacda32e04aac73f730 (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
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | cmd/.gitignore | 1 | ||||
| -rw-r--r-- | include/.gitignore | 1 | ||||
| -rw-r--r-- | lib/.gitignore | 1 | ||||
| -rw-r--r-- | module/.gitignore | 1 | ||||
| -rw-r--r-- | module/spl/.gitignore | 1 | ||||
| -rw-r--r-- | module/splat/.gitignore | 1 | ||||
| -rw-r--r-- | scripts/.gitignore | 1 |
8 files changed, 1 insertions, 7 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 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 |