From 9db7084fcdf6d57b892312ca641a97356629c04a Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Fri, 4 Jul 2014 10:18:07 +0200 Subject: [PATCH 1/1] version: 1.7.0 The makefile rule "showversion" needs a fix to handle empty RTE_VER_SUFFIX. Signed-off-by: Thomas Monjalon --- lib/librte_eal/common/include/rte_version.h | 4 ++-- mk/rte.sdkconfig.mk | 2 +- pkg/dpdk-core.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/librte_eal/common/include/rte_version.h b/lib/librte_eal/common/include/rte_version.h index 9333277a97..20f1c74d96 100644 --- a/lib/librte_eal/common/include/rte_version.h +++ b/lib/librte_eal/common/include/rte_version.h @@ -69,14 +69,14 @@ extern "C" { /** * Extra string to be appended to version number */ -#define RTE_VER_SUFFIX "-rc" +#define RTE_VER_SUFFIX "" /** * Patch release number * 0-15 = release candidates * 16 = release */ -#define RTE_VER_PATCH_RELEASE 4 +#define RTE_VER_PATCH_RELEASE 16 /** * Macro to compute a version number usable for comparisons diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk index c125fa1f69..d43c43089d 100644 --- a/mk/rte.sdkconfig.mk +++ b/mk/rte.sdkconfig.mk @@ -36,7 +36,7 @@ showversion: -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"; \ - if [ -z "$$4" ]; then echo; \ + if [ -z "$$5" ]; then echo; \ else printf '%s' "$$4"; \ if [ $$5 -lt 16 ] ; then echo $$5; \ else echo $$(($$5 - 16)); fi; \ diff --git a/pkg/dpdk-core.spec b/pkg/dpdk-core.spec index c08724faf3..a67d7c11cf 100644 --- a/pkg/dpdk-core.spec +++ b/pkg/dpdk-core.spec @@ -30,7 +30,7 @@ # OF THE POSSIBILITY OF SUCH DAMAGE. Name: dpdk -Version: 1.6.0r2 +Version: 1.7.0 Release: 1 Packager: packaging@6wind.com URL: http://dpdk.org -- 2.20.1