diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2015-10-15T18·29-0700 |
|---|---|---|
| committer | John Ericson <Ericson2314@Yahoo.com> | 2015-10-15T18·53-0700 |
| commit | a7dd26961db0a08ff628ed1e72048c65128b9ca1 (patch) | |
| tree | 4b81d4527825aac5e0f6c74c4c3f26848d9eb36c | |
| parent | 164487a5ba568fa344fae9f4b9515b351da430b6 (diff) | |
Don't depend on git when generating source tarball
| -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 dd5f1c4d37bc..4459bf165a50 100644 --- a/release.nix +++ b/release.nix @@ -36,7 +36,9 @@ let postUnpack = '' # Clean up when building from a working tree. - git -C $sourceRoot clean -fd + if [[ -d $sourceRoot/.git ]]; then + git -C $sourceRoot clean -fd + fi ''; preConfigure = '' |