libpayload: Add liblzma, libcbfs

[coreboot.git] / Makefile.inc

diff --git a/Makefile.inc b/Makefile.inc
index 72a3b550179261510d4f9dafce6a2efba7088408..65550e6bd9fbaa1a7afc1ba6a562b873991c312a 100644 (file)
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -19,7 +19,7 @@
 
 #######################################################################
 # misleadingly named, this is the coreboot version
-REV=-r$(shell if [ -d $(top)/.svn -a -f "`which svnversion`" ]; then svnversion $(top); else if [ -d $(top)/.git -a -f "`which git`" ]; then git --git-dir=/$(top)/.git log|grep git-svn-id|cut -f 2 -d@|cut -f 1 -d' '|sort -g|tail -1; fi; fi)
+REV=-r$(shell if [ -d $(top)/.git -a -f "`which git`" ]; then git --git-dir=/$(top)/.git show -s --pretty=format:%h; fi)
 export KERNELVERSION      := 4.0$(REV)
 
 #######################################################################
@@ -232,10 +232,13 @@ lint:
        rm -f $$LINTLOG
 
 gitconfig:
-       if ! [ -x .git/hooks/commit-msg ]; then wget -O .git/hooks/commit-msg http://review.coreboot.org/tools/hooks/commit-msg; chmod +x .git/hooks/commit-msg; fi
+       if ! [ -x .git/hooks/commit-msg ]; then cp util/gitconfig/commit-msg .git/hooks/commit-msg; chmod +x .git/hooks/commit-msg; fi
        (git config --global user.name >/dev/null && git config --global user.email >/dev/null) || (printf 'Please configure your name and email in git:\n\n git config --global user.name "Your Name Comes Here"\n git config --global user.email your.email@example.com\n'; exit 1)
 
 crossgcc: clean-for-update
+       $(MAKE) -C util/crossgcc build-without-gdb
+
+crosstools: clean-for-update
        $(MAKE) -C util/crossgcc build
 
 crossgcc-clean: clean-for-update