narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 5f810751d7 into f68c8b09e3

pull/534/merge
Masahiro Yamada 2025-03-20 13:04:19 +03:00 committed by GitHub
parent f68c8b09e3 5f810751d7
commit da8e435eeb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Makefile
View File

@ -210,8 +210,9 @@ install :
# #
# Version number calculations # Version number calculations
# #
ifneq ($(wildcard ../.git),) VERSIONS := $(if $(wildcard ../.git),$(shell git describe --tags --always --long --abbrev=32 --match "v*"))
VERSIONS := $(shell git describe --tags --always --long --abbrev=1 --match "v*")
ifneq ($(filter v%, $(VERSIONS)),)
VERSION_TUPLE := $(subst ., ,$(subst -, ,$(patsubst v%,%,$(VERSIONS)))) VERSION_TUPLE := $(subst ., ,$(subst -, ,$(patsubst v%,%,$(VERSIONS))))
VERSION_MAJOR := $(word 1,$(VERSION_TUPLE)) VERSION_MAJOR := $(word 1,$(VERSION_TUPLE))
VERSION_MINOR := $(word 2,$(VERSION_TUPLE)) VERSION_MINOR := $(word 2,$(VERSION_TUPLE))
@ -227,11 +228,12 @@ VERSION_MAJOR = 1
VERSION_MINOR = 0 VERSION_MINOR = 0
VERSION_PATCH = 0 VERSION_PATCH = 0
EXTRAVERSION = + EXTRAVERSION = +
GITVERSION = $(VERSIONS)
endif endif
MM_VERSION = $(VERSION_MAJOR).$(VERSION_MINOR) MM_VERSION = $(VERSION_MAJOR).$(VERSION_MINOR)
VERSION = $(MM_VERSION).$(VERSION_PATCH)$(EXTRAVERSION) VERSION = $(MM_VERSION).$(VERSION_PATCH)$(EXTRAVERSION)
ifneq ($(GITVERSION),) ifneq ($(GITVERSION),)
VERSION += ($(GITVERSION)) VERSION += ($(shell echo $(GITVERSION) | cut -c1-8))
endif endif
version : version :
@$(ECHO) "$(VERSION)" @$(ECHO) "$(VERSION)"