From 7fc85f24aacb7fae828e1731e9d7dc5fd6bdd502 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Pialasse Date: Thu, 19 Sep 2024 01:53:37 -0400 Subject: [PATCH] recreate archive if git cmd available (not Buildsys) and if archive not in git --- Makefile.common | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.common b/Makefile.common index 91c372a..34742c6 100644 --- a/Makefile.common +++ b/Makefile.common @@ -250,16 +250,20 @@ endif # Create the .tar.gz or whatever file $(ARCHIVEFILE): +ifneq (, $(shell which git)) $(info create or update ${ARCHIVEFILE} archive) @mkdir -p "${TEMPDIR}/${TREEPATH}" ;\ if [ -d ${CODEDIR} ] ; then cp -R "${CODEDIR}" "${TEMPDIR}/${TREEPATH}" ; fi ; \ if [ -e createlinks ] ; then cp createlinks "${TEMPDIR}/${TREEPATH}/." ; fi ; \ if [ -d additional ] ; then cp -r additional/* "${TEMPDIR}/${TREEPATH}/." ; fi ; \ find "${TEMPDIR}/${TREEPATH}/." -type f -name ".gitignore" -delete ; \ - rm -f ${ARCHIVEFILE} ;\ - tar -caf "${ARCHIVEFILE}" -C "${TEMPDIR}" "${TREEPATH}" ;\ + git ls-files --error-unmatch ${ARCHIVEFILE} 2>/dev/null || rm -f ${ARCHIVEFILE} ;\ + git ls-files --error-unmatch ${ARCHIVEFILE} 2>/dev/null || tar -caf "${ARCHIVEFILE}" -C "${TEMPDIR}" "${TREEPATH}" ;\ ls -l ${ARCHIVEFILE} ;\ rm -Rf "${TEMPDIR}/${TREEPATH}/" +else + $(info git not available, keeping archive ${ARCHIVEFILE} as is (buildsystem mock?)) +endif test-srpm: srpm