From c0875fdafa11651e0ff64957f589bdf5fa1b171e Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 30 Oct 2016 20:27:24 -0400 Subject: [PATCH] readd Git commit hash to version string --- Makefile | 7 +++++-- etc/example.conf | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index db1520f70..10e443a39 100644 --- a/Makefile +++ b/Makefile @@ -37,8 +37,11 @@ LDFLAGS += -L$(BUILDDIR) ifdef CI CFLAGS += -D_GIT_REV='"${CI_BUILD_REF:0:7}~ci"' -else ifdef GIT - CFLAGS += -D_GIT_REV='"$(shell git rev-parse --short HEAD)"' +else + GIT = $(shell type -p git) + ifneq ($(GIT),) + CFLAGS += -D_GIT_REV='"$(shell git rev-parse --short HEAD)"' + endif endif # We must compile without optimizations for gcov! diff --git a/etc/example.conf b/etc/example.conf index 7f5ce6753..52e24179f 100644 --- a/etc/example.conf +++ b/etc/example.conf @@ -30,7 +30,6 @@ nodes = { # udp Send / receive UDP packets # ip Send / receive IP packets # eth Send / receive raw Ethernet frames (IEEE802.3) - header = "gtnet-skt:fake", # Header can be one of: # default | villas Use VILLASnode protocol (see struct msg) (default)