RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-17 10:52:44 +01:00
Code Releases Activity

Merge pull request #10281 from smlng/pr/riotversion

Browse Source 
build: remove hostname from RIOT_VERSION string
This commit is contained in:
Martine Lenders 2018-10-29 12:52:14 +01:00 committed by GitHub
commit 289e635e5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.include
View File

@ -319,7 +319,7 @@ include $(RIOTMAKE)/cflags.inc.mk
# make the RIOT version available to the program # make the RIOT version available to the program
ifeq ($(origin RIOT_VERSION), undefined) ifeq ($(origin RIOT_VERSION), undefined)
GIT_STRING := $(shell git --git-dir="$(RIOTBASE)/.git" describe --always --abbrev=4 --dirty=-`hostname` 2> /dev/null) GIT_STRING := $(shell git --git-dir="$(RIOTBASE)/.git" describe --always --abbrev=4 2> /dev/null)
ifneq (,$(GIT_STRING)) ifneq (,$(GIT_STRING))
GIT_BRANCH := $(shell git --git-dir="$(RIOTBASE)/.git" rev-parse --abbrev-ref HEAD) GIT_BRANCH := $(shell git --git-dir="$(RIOTBASE)/.git" rev-parse --abbrev-ref HEAD)
ifeq ($(strip $(GIT_BRANCH)),master) ifeq ($(strip $(GIT_BRANCH)),master)