Update Makefile to get CMSIS 5 version from git

fpistm · fpistm · commit 50d200d8e881 · 2018-08-14T11:58:22.000+02:00
Use commit date to always generate the same package using tar.

Signed-off-by: Frederic.Pillon &lt;frederic.pillon@st.com&gt;
diff --git a/Makefile b/Makefile
@@ -52,7 +52,7 @@ cmsis: PACKAGE_FOLDER := CMSIS
 cmsis: clean print_info
 	@echo ----------------------------------------------------------
 	@echo "Packaging module."
-	tar --exclude=./.gitattributes \
+	@tar --exclude=./.gitattributes \
 		--exclude=./.travis.yml \
 		--exclude=CMSIS/index.html \
 		--exclude=CMSIS/Documentation \
@@ -65,12 +65,14 @@ cmsis: clean print_info
 	$(MAKE) PACKAGE_VERSION=$(PACKAGE_VERSION) --no-builtin-rules postpackaging -C .
 	@echo ----------------------------------------------------------
 
-cmsis5: PACKAGE_VERSION := 5.3.0
 cmsis5: PACKAGE_FOLDER := CMSIS_5
+cmsis5: PACKAGE_VERSION := $(shell git --git-dir=$(PACKAGE_FOLDER)/.git describe --tags)
+cmsis5: PACKAGE_DATE := $(firstword $(shell git --git-dir=$(PACKAGE_FOLDER)/.git log -1 --pretty=format:%ci))
 cmsis5: clean print_info
 	@echo ----------------------------------------------------------
 	@echo "Packaging module."
-	tar --exclude=docs \
+	@tar --mtime='$(PACKAGE_DATE)' \
+		--exclude=docs \
 		--exclude=CMSIS/CoreValidation \
 		--exclude=CMSIS/Documentation \
 		--exclude=CMSIS/DoxyGen \
@@ -113,5 +115,5 @@ postpackaging:
 	@echo "PACKAGE_CHKSUM      = $(PACKAGE_CHKSUM)"
 	@echo "PACKAGE_SIZE        = $(PACKAGE_SIZE)"
 	@echo "PACKAGE_FILENAME    = $(PACKAGE_FILENAME)"
-	cat extras/package_index.json.template | sed s/%%VERSION%%/$(PACKAGE_VERSION)/ | sed s/%%FILENAME%%/$(PACKAGE_FILENAME)/ | sed s/%%CHECKSUM%%/$(PACKAGE_CHKSUM)/ | sed s/%%SIZE%%/$(PACKAGE_SIZE)/ > package_$(PACKAGE_NAME)_$(PACKAGE_VERSION)_index.json
+	@cat extras/package_index.json.template | sed s/%%VERSION%%/$(PACKAGE_VERSION)/ | sed s/%%FILENAME%%/$(PACKAGE_FILENAME)/ | sed s/%%CHECKSUM%%/$(PACKAGE_CHKSUM)/ | sed s/%%SIZE%%/$(PACKAGE_SIZE)/ > package_$(PACKAGE_NAME)_$(PACKAGE_VERSION)_index.json
 	@echo "package_$(PACKAGE_NAME)_$(PACKAGE_VERSION)_index.json created"
