Change in osmocom-bb[master]: firmware/makefile: Add GIT_SHORTHASH

2020-08-06 Thread laforge
laforge has submitted this change. ( 
https://gerrit.osmocom.org/c/osmocom-bb/+/19542 )

Change subject: firmware/makefile: Add GIT_SHORTHASH
..

firmware/makefile: Add GIT_SHORTHASH

GIT_SHORTHASH is used by the recently introduced snake game.

Change-Id: I837e3dcc5c44e64ca7f6c243c08981ed01f35dd1
---
M src/target/firmware/Makefile.inc
1 file changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/src/target/firmware/Makefile.inc b/src/target/firmware/Makefile.inc
index a91cf4f..2be240d 100644
--- a/src/target/firmware/Makefile.inc
+++ b/src/target/firmware/Makefile.inc
@@ -39,6 +39,7 @@
  GIT VERSION 

 GIT_COMMIT:=$(shell git describe --always)
+GIT_SHORTHASH:=$(shell git rev-parse --short HEAD)
 GIT_MODIFIED:=$(shell (git status | grep "modified:\|added:\|deleted:" -q) && 
echo "-modified")

 GIT_REVISION:=$(GIT_COMMIT)$(GIT_MODIFIED)
@@ -46,6 +47,9 @@
 ASFLAGS += -DGIT_REVISION=\"$(GIT_REVISION)\"
 CFLAGS += -DGIT_REVISION=\"$(GIT_REVISION)\"

+ASFLAGS += -DGIT_SHORTHASH=\"$(GIT_SHORTHASH)\"
+CFLAGS += -DGIT_SHORTHASH=\"$(GIT_SHORTHASH)\"
+
  GLOBAL DATA 

 ALL_OBJS=

--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19542
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I837e3dcc5c44e64ca7f6c243c08981ed01f35dd1
Gerrit-Change-Number: 19542
Gerrit-PatchSet: 1
Gerrit-Owner: roox 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-MessageType: merged


Change in osmocom-bb[master]: firmware/makefile: Add GIT_SHORTHASH

2020-08-06 Thread laforge
laforge has posted comments on this change. ( 
https://gerrit.osmocom.org/c/osmocom-bb/+/19542 )

Change subject: firmware/makefile: Add GIT_SHORTHASH
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19542
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I837e3dcc5c44e64ca7f6c243c08981ed01f35dd1
Gerrit-Change-Number: 19542
Gerrit-PatchSet: 1
Gerrit-Owner: roox 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge 
Gerrit-Comment-Date: Thu, 06 Aug 2020 21:13:14 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment


Change in osmocom-bb[master]: firmware/makefile: Add GIT_SHORTHASH

2020-08-06 Thread roox
roox has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmocom-bb/+/19542 )


Change subject: firmware/makefile: Add GIT_SHORTHASH
..

firmware/makefile: Add GIT_SHORTHASH

GIT_SHORTHASH is used by the recently introduced snake game.

Change-Id: I837e3dcc5c44e64ca7f6c243c08981ed01f35dd1
---
M src/target/firmware/Makefile.inc
1 file changed, 4 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/42/19542/1

diff --git a/src/target/firmware/Makefile.inc b/src/target/firmware/Makefile.inc
index a91cf4f..2be240d 100644
--- a/src/target/firmware/Makefile.inc
+++ b/src/target/firmware/Makefile.inc
@@ -39,6 +39,7 @@
  GIT VERSION 

 GIT_COMMIT:=$(shell git describe --always)
+GIT_SHORTHASH:=$(shell git rev-parse --short HEAD)
 GIT_MODIFIED:=$(shell (git status | grep "modified:\|added:\|deleted:" -q) && 
echo "-modified")

 GIT_REVISION:=$(GIT_COMMIT)$(GIT_MODIFIED)
@@ -46,6 +47,9 @@
 ASFLAGS += -DGIT_REVISION=\"$(GIT_REVISION)\"
 CFLAGS += -DGIT_REVISION=\"$(GIT_REVISION)\"

+ASFLAGS += -DGIT_SHORTHASH=\"$(GIT_SHORTHASH)\"
+CFLAGS += -DGIT_SHORTHASH=\"$(GIT_SHORTHASH)\"
+
  GLOBAL DATA 

 ALL_OBJS=

--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/19542
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I837e3dcc5c44e64ca7f6c243c08981ed01f35dd1
Gerrit-Change-Number: 19542
Gerrit-PatchSet: 1
Gerrit-Owner: roox 
Gerrit-MessageType: newchange