[PATCH v2 1/2] version: switch to year/month version numbers
From: John McNamara <hidden>
Date: 2016-02-10 14:34:22
Subsystem:
library code, the rest · Maintainers:
Andrew Morton, Linus Torvalds
From: "Richardson, Bruce" <redacted>
As discussed on list, switch numbering scheme to be based on year/month.
Release 2.3 then becomes 16.04.
Ref: http://dpdk.org/ml/archives/dev/2015-December/030336.html
Also, added zero padding to the month so that it appear as 16.04 and
not 16.4 in "make showversion" and rte_version().
Signed-off-by: Bruce Richardson <redacted>
Signed-off-by: John McNamara <redacted>
---
lib/librte_eal/common/include/rte_version.h | 10 +++++-----
mk/rte.sdkconfig.mk | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/librte_eal/common/include/rte_version.h b/lib/librte_eal/common/include/rte_version.h
index 6b1890e..4784e67 100644
--- a/lib/librte_eal/common/include/rte_version.h
+++ b/lib/librte_eal/common/include/rte_version.h@@ -50,17 +50,17 @@ extern "C" { /** * String that appears before the version number */ -#define RTE_VER_PREFIX "RTE" +#define RTE_VER_PREFIX "DPDK" /** * Major version number i.e. the x in x.y.z */ -#define RTE_VER_MAJOR 2 +#define RTE_VER_MAJOR 16 /** * Minor version number i.e. the y in x.y.z */ -#define RTE_VER_MINOR 3 +#define RTE_VER_MINOR 4 /** * Patch level number i.e. the z in x.y.z
@@ -105,13 +105,13 @@ rte_version(void) if (version[0] != 0) return version; if (strlen(RTE_VER_SUFFIX) == 0) - snprintf(version, sizeof(version), "%s %d.%d.%d", + snprintf(version, sizeof(version), "%s %d.%02d.%d", RTE_VER_PREFIX, RTE_VER_MAJOR, RTE_VER_MINOR, RTE_VER_PATCH_LEVEL); else - snprintf(version, sizeof(version), "%s %d.%d.%d%s%d", + snprintf(version, sizeof(version), "%s %d.%02d.%d%s%d", RTE_VER_PREFIX, RTE_VER_MAJOR, RTE_VER_MINOR,
diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk
index f8d95b1..564a5c3 100644
--- a/mk/rte.sdkconfig.mk
+++ b/mk/rte.sdkconfig.mk@@ -35,7 +35,7 @@ showversion: $$(sed -rne 's,^#define RTE_VER_[A-Z_]*[[:space:]]+([0-9]+).*,\1,p' \ -e 's,^#define RTE_VER_SUFFIX[[:space:]]+"(.*)",\1,p' \ $(RTE_SRCDIR)/lib/librte_eal/common/include/rte_version.h) ;\ - printf '%d.%d.%d' "$$1" "$$2" "$$3"; \ + printf '%d.%02d.%d' "$$1" "$$2" "$$3"; \ if [ -z "$$5" ]; then echo; \ else printf '%s' "$$4"; \ if [ $$5 -lt 16 ] ; then echo $$5; \
--
2.5.0