diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-07-10 22:31:58 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-07-10 22:31:58 -0400 |
| commit | 42418ca7c6238b16381fa8ccdf2547a984a4dca7 (patch) | |
| tree | f65a0e6ae596a84b592fe20c0290f5cc759745a5 | |
| parent | c2c04ad9e61f7e0ac3d7a88973ab96a824a210e3 (diff) | |
| parent | 7593e76c966a8b3990efa76e6dfe3ac21a8bcaed (diff) | |
Merge branch 'joeyconfig'
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 6 insertions, 1 deletions
@@ -17,8 +17,12 @@ install: cat dist/propellor-*.tar.gz | (cd dist/gittmp && tar zx --strip-components=1) # cabal sdist does not preserve symlinks, so copy over file cd dist/gittmp && for f in $$(find -type f); do rm -f $$f; cp -a ../../$$f $$f; done + export GIT_AUTHOR_NAME=build && \ + export GIT_AUTHOR_EMAIL=build@buildhost && \ + export GIT_COMMITTER_NAME=build && \ + export GIT_COMMITTER_EMAIL=build@buildhost && \ cd dist/gittmp && git init && \ - git add . \ + && git add . \ && git commit -q -m "distributed version of propellor" \ && git bundle create $(DESTDIR)/usr/src/propellor/propellor.git master HEAD \ && git show-ref master --hash > $(DESTDIR)/usr/src/propellor/head diff --git a/debian/changelog b/debian/changelog index 8d502870..4cb94403 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ propellor (2.6.0) UNRELEASED; urgency=medium * Version dependency on exceptions. * Systemd: Add masked property. Thanks, Sean Whitton + * Fix make install target to work even when git is not configured. -- Joey Hess <id@joeyh.name> Tue, 16 Jun 2015 14:49:12 -0400 |