From: Harald Hoyer Date: Thu, 5 Mar 2009 10:05:35 +0000 (+0100) Subject: do not get GITTAG, if there is no .git X-Git-Tag: 0.1~377 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6567383252a4567be29abe82bfeb2c11ccf37d8c;p=thirdparty%2Fdracut.git do not get GITTAG, if there is no .git --- diff --git a/Makefile b/Makefile index 8129b2c1d..d01eaba2a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ VERSION=0.0 -GITVERSION=$(shell git rev-list --abbrev-commit -n 1 HEAD |cut -b 1-8) +GITVERSION=$(shell [ -d .git ] && git rev-list --abbrev-commit -n 1 HEAD |cut -b 1-8) modules.d/99base/switch_root: switch_root.c gcc -o modules.d/99base/switch_root switch_root.c @@ -26,7 +26,7 @@ dracut-$(VERSION)-$(GITVERSION).tar.bz2: git archive --format=tar HEAD --prefix=dracut-$(VERSION)-$(GITVERSION)/ |bzip2 > dracut-$(VERSION)-$(GITVERSION).tar.bz2 rpm: dracut-$(VERSION)-$(GITVERSION).tar.bz2 - rpmbuild --define "_sourcedir $$PWD" --define "_specdir $$PWD" --define "_builddir $$PWD" --define "_srcrpmdir $$PWD" --define "_rpmdir $$PWD" --define "gittag $(GITVERSION)" -ba dracut.spec + rpmbuild --define "_topdir $$PWD" --define "_sourcedir $$PWD" --define "_specdir $$PWD" --define "_builddir $$PWD" --define "_srcrpmdir $$PWD" --define "_rpmdir $$PWD" --define "gittag $(GITVERSION)" -ba dracut.spec testimage: ./dracut -l test.img $(uname -r)