aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBrandon Maier <brandon.maier@collins.com>2023-08-01 23:45:55 +0000
committerDavid Gibson <david@gibson.dropbear.id.au>2023-08-06 14:53:29 +1000
commit0f5864567745c50e481b132538969b87259891e3 (patch)
tree3db6485a75f8f1e4aa1ffa35dea5e319cc996c18 /Makefile
parent38165954c13bdc0efe40593c252de418e6521fe2 (diff)
downloaddtc-0f5864567745c50e481b132538969b87259891e3.zip
dtc-0f5864567745c50e481b132538969b87259891e3.tar.gz
dtc-0f5864567745c50e481b132538969b87259891e3.tar.bz2
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 2 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index c0b68a2..fc4a133 100644
--- a/Makefile
+++ b/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; \