summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorBruce Richardson <bruce.richardson@intel.com>2019-03-15 18:20:21 +0000
committerThomas Monjalon <thomas@monjalon.net>2019-03-27 09:43:47 +0100
commitd320fe56bd51bbc087bb1c7e0cf1ffdec004185b (patch)
treef3e7de33682236b65e5b73afe26ed5e4bd1c7d42 /mk
parent664c59fac1e68f9a59634690776c36a4e5891a8a (diff)
downloaddpdk-d320fe56bd51bbc087bb1c7e0cf1ffdec004185b.zip
dpdk-d320fe56bd51bbc087bb1c7e0cf1ffdec004185b.tar.gz
dpdk-d320fe56bd51bbc087bb1c7e0cf1ffdec004185b.tar.xz
build: use version number from config file
Since we have the version number in a separate file at the root level, we should not need to duplicate this in rte_version.h too. Best approach here is to move the macros for specifying the year/month/etc. parts from the version header file to the build config file - leaving the other utility macros for e.g. printing the version string, where they are. For "make", this is done by having a little bit of awk parse the version file and pass the results through to the preprocessor for the config generation stage. For "meson", this is done by parsing the version and adding it to the standard dpdk_conf object. In both cases, we need to append a large number - in this case "99", previously 16 in original code - to the version number when we want to do version number comparisons. Without this, the release version e.g. 19.05.0 will compare as less than it's RC's e.g. 19.05.0-rc4. With it, the comparison is correct as "19.05.0.99 > 19.05.0-rc4.99". Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> Acked-by: Luca Boccassi <bluca@debian.org> Acked-by: Thomas Monjalon <thomas@monjalon.net>
Diffstat (limited to 'mk')
-rw-r--r--mk/rte.sdkconfig.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk
index 46ec9e7..f538649 100644
--- a/mk/rte.sdkconfig.mk
+++ b/mk/rte.sdkconfig.mk
@@ -74,9 +74,16 @@ else
# To do so the temp config is checked for duplicate keys with cut/sort/uniq
# Then for each of those identified duplicates as long as there are more than
# just one left the last match is removed.
+# Part of the config includes the version information taken from "VERSION"
+# in the repo. This needs to be split into the various parts using sed and awk.
+# To ensure correct version comparison, we append ".99" to the version number
+# so that the version of a release is higher than that of its rc's.
$(RTE_OUTPUT)/.config: $(RTE_CONFIG_TEMPLATE) FORCE | $(RTE_OUTPUT)
$(Q)if [ "$(RTE_CONFIG_TEMPLATE)" != "" -a -f "$(RTE_CONFIG_TEMPLATE)" ]; then \
$(CPP) -undef -P -x assembler-with-cpp \
+ `cat $(RTE_SRCDIR)/VERSION | \
+ sed -e 's/-rc/.-rc./' -e 's/$$/..99/' | \
+ awk -F '.' '{print "-D__YEAR="int($$1), "-D__MONTH="int($$2), "-D__MINOR="int($$3), "-D__SUFFIX=\""$$4"\"", "-D__RELEASE="int($$5)}'` \
-ffreestanding \
-o $(RTE_OUTPUT)/.config_tmp $(RTE_CONFIG_TEMPLATE) ; \
config=$$(cat $(RTE_OUTPUT)/.config_tmp) ; \