Merge pull request #4964 from inverse-inc/fix/git_commit_id

[pkg] generate git_commit_id for maintenance

.gitlab-ci.yml

@@ -193,13 +193,17 @@ variables:
 
 .rpm_script:
   script:
+    # temp
+    - echo "%git_commit $CI_COMMIT_SHA" >> ${RPM_DIR}/.rpmmacros
     - cp ${RPM_DIR}/.rpmmacros ${HOME}
     - ci-build-pkg ${RPM_DIR}
 
 .deb_script:
   script:
     - ./${CIDIR}/debian/convert-to-native-package.sh
     - cp ${CIDIR}/debian/.devscripts ${HOME}
+    # temp
+    - make conf/git_commit_id
     - quilt push
     - ci-build-pkg ${DEB_DIR}
   variables:

Makefile

@@ -260,3 +260,7 @@ html_install:
 	cp -v --no-dereference $(SRC_HTML_PFAPPDIR_STATIC)/alt \
 	    $(DESTDIR)$(HTML_PFAPPDIR_STATIC)
 
+.PHONY: conf/git_commit_id
+conf/git_commit_id:
+	echo $$CI_COMMIT_SHA > $@
+

debian/rules

@@ -143,7 +143,6 @@ install: build
 	install -d -m2770 $(CURDIR)/debian/packetfence-redis-cache$(PREFIX)/$(NAME)/logs
 	install -d -m2770 $(CURDIR)/debian/packetfence-redis-cache$(PREFIX)/$(NAME)/var/redis_cache
 	install -m0600 conf/redis_cache.conf.example $(CURDIR)/debian/packetfence-redis-cache$(PREFIX)/$(NAME)/conf/redis_cache.conf
-	echo $(C_ID) > $(CURDIR)/debian/packetfence$(PREFIX)/$(NAME)/conf/git_commit_id
 
 	#Portal javascript/css
 	rm -f $(CURDIR)/debian/packetfence$(PREFIX)/$(NAME)/html/common/styles.css