diff options
| author | Harald Musum <musum@verizonmedia.com> | 2021-09-28 13:44:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-28 13:44:08 +0200 |
| commit | 26d5d1ecf68473b929c08394d85f21991122ce83 (patch) | |
| tree | ae8df0ea03dd504337f7dca4868068b2419c7e04 | |
| parent | e0c15dfaf9c2005cad03179103bfde171cafd2f6 (diff) | |
| parent | 6d4239aec638acb198054fe32e57dadcc28769a6 (diff) | |
Merge pull request #19317 from vespa-engine/aressem/fix-srpm-makefile
Use lazy eval when getting VESPA_VERSOION for srpm target.
| -rw-r--r-- | .copr/Makefile | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/.copr/Makefile b/.copr/Makefile index b0322bf29b3..d515053b8bc 100644 --- a/.copr/Makefile +++ b/.copr/Makefile @@ -6,13 +6,17 @@ SOURCEDIR := $(RPMTOPDIR)/SOURCES SPECDIR := $(RPMTOPDIR)/SPECS SPECFILE := $(SPECDIR)/vespa-$(VESPA_VERSION).spec -srpm: +deps: dnf install -y git rpmdevtools - $(TOP)/../dist.sh $$(git tag --points-at HEAD | grep -oP "\d+\.\d+\.\d+" | sort -V | tail -1) - spectool -g -C $(SOURCEDIR) $(SPECFILE) - rpmbuild -bs --define "_topdir $(RPMTOPDIR)" $(SPECFILE) + +srpm: VESPA_VERSION = $$(git tag --points-at HEAD | grep -oP "\d+\.\d+\.\d+" | sort -V | tail -1) +srpm: deps + $(TOP)/../dist.sh $(VESPA_VERSION) + spectool -g -C $(SOURCEDIR) $(SPECDIR)/vespa-$(VESPA_VERSION).spec + rpmbuild -bs --define "_topdir $(RPMTOPDIR)" $(SPECDIR)/vespa-$(VESPA_VERSION).spec cp -a $(RPMTOPDIR)/SRPMS/* $(outdir) + clean: -rm -rf $(RPMTOPDIR) -.PHONY: srpm clean +.PHONY: clean deps srpm |