diff options
| author | Simon Rettberg | 2020-02-25 11:29:38 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2020-02-25 11:29:38 +0100 |
| commit | eef99e53b4f768167cbc4573be9d2893aee9ba6b (patch) | |
| tree | 0f7487054e24440825217c57eb3a176614b707e3 /src | |
| parent | [efi] Consider RDRAND == -1 invalid, use TSC (diff) | |
| download | ipxe-eef99e53b4f768167cbc4573be9d2893aee9ba6b.tar.gz ipxe-eef99e53b4f768167cbc4573be9d2893aee9ba6b.tar.xz ipxe-eef99e53b4f768167cbc4573be9d2893aee9ba6b.zip | |
Revert "[build] Construct full version number automatically from git revision"
Build fails on Debian 9 for reasons unknown.
This reverts commit 8f1514a00450119b04b08642c55aa674bdf5a4ef.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/Makefile b/src/Makefile index a84efd6d6..c0bc45fa6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -207,27 +207,14 @@ install : # # Version number calculations # -ifneq ($(wildcard ../.git),) -VERSIONS := $(shell git describe --tags --always --long --abbrev=1 --match "v*") -VERSION_TUPLE := $(subst ., ,$(subst -, ,$(patsubst v%,%,$(VERSIONS)))) -VERSION_MAJOR := $(word 1,$(VERSION_TUPLE)) -VERSION_MINOR := $(word 2,$(VERSION_TUPLE)) -VERSION_PATCH := $(word 3,$(VERSION_TUPLE)) -ifeq ($(word 4,$(VERSION_TUPLE)),0) -EXTRAVERSION := -else -EXTRAVERSION := + -endif -GITVERSION = $(word 5,$(VERSION_TUPLE)) -else VERSION_MAJOR = 1 VERSION_MINOR = 0 VERSION_PATCH = 0 EXTRAVERSION = + -endif MM_VERSION = $(VERSION_MAJOR).$(VERSION_MINOR) VERSION = $(MM_VERSION).$(VERSION_PATCH)$(EXTRAVERSION) -ifneq ($(GITVERSION),) +ifneq ($(wildcard ../.git),) +GITVERSION := $(shell git describe --always --abbrev=1 --match "" 2>/dev/null) VERSION += ($(GITVERSION)) endif version : |