diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-10-26T10·14+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-10-26T10·14+0100 |
| commit | f6a224bd68f739ef9825df474d4b4f3379a5296b (patch) | |
| tree | 37fd9a1def8b01cd7120fdb27ad61ddae2bfc21d | |
| parent | 45b2f32cc1f1ef3623630427f37a0b0d0093d53e (diff) | |
| parent | a7dd26961db0a08ff628ed1e72048c65128b9ca1 (diff) | |
Merge pull request #667 from Ericson2314/mk-dist
Don't depend on .git/ when generating source tarball V2
| -rw-r--r-- | local.mk | 3 | ||||
| -rw-r--r-- | release.nix | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/local.mk b/local.mk index 160057ad2625..2541f3f32290 100644 --- a/local.mk +++ b/local.mk @@ -1,5 +1,6 @@ ifeq ($(MAKECMDGOALS), dist) - dist-files += $(shell git ls-files) + # Make sure we are in repo root with `--git-dir` + dist-files += $(shell git --git-dir=.git ls-files || find * -type f) endif dist-files += configure config.h.in nix.spec diff --git a/release.nix b/release.nix index 5a5a1226fe2c..4459bf165a50 100644 --- a/release.nix +++ b/release.nix @@ -36,7 +36,9 @@ let postUnpack = '' # Clean up when building from a working tree. - (cd $sourceRoot && (git ls-files -o | xargs -r rm -v)) + if [[ -d $sourceRoot/.git ]]; then + git -C $sourceRoot clean -fd + fi ''; preConfigure = '' |