mirror of
https://github.com/dgibson/dtc.git
synced 2026-04-11 16:37:42 -04:00
move release version into VERSION.txt
To synchronize the release version of the Makefile and Meson build systems, pull the version info from a shared file. Meson requires that the shared library version follow the X.Y.Z numbering scheme. But the Makefile supported building shared libraries with an EXTRAVERSION appended, for example X.Y.Z-rc1. We want to keep the output of both systems the same to avoid issues, so we drop support for the Makefile EXTRAVERSION. Signed-off-by: Brandon Maier <brandon.maier@collins.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
38165954c1
commit
0f58645677
3 changed files with 5 additions and 8 deletions
8
Makefile
8
Makefile
|
|
@ -5,14 +5,11 @@
|
|||
|
||||
#
|
||||
# Version information will be constructed in this order:
|
||||
# EXTRAVERSION might be "-rc", for example.
|
||||
# DTC_VERSION release version as MAJOR.MINOR.PATCH
|
||||
# LOCAL_VERSION is likely from command line.
|
||||
# CONFIG_LOCALVERSION from some future config system.
|
||||
#
|
||||
VERSION = 1
|
||||
PATCHLEVEL = 7
|
||||
SUBLEVEL = 0
|
||||
EXTRAVERSION =
|
||||
DTC_VERSION = $(shell cat VERSION.txt)
|
||||
LOCAL_VERSION =
|
||||
CONFIG_LOCALVERSION =
|
||||
|
||||
|
|
@ -103,7 +100,6 @@ endif
|
|||
# Rules for versioning
|
||||
#
|
||||
|
||||
DTC_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
|
||||
VERSION_FILE = version_gen.h
|
||||
|
||||
CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue