version: 1.7.0

The makefile rule "showversion" needs a fix to handle empty RTE_VER_SUFFIX.

Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>

diff --git a/lib/librte_eal/common/include/rte_version.h b/lib/librte_eal/common/include/rte_version.h
index 9333277a977046546b3d679db2b642dac188492c..20f1c74d9648c3769e3652b955699e96d231f820 100644 (file)
--- 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 c125fa1f690b565d3b1449a69e03445fb8703075..d43c43089d55c7deed77f49a2a6dbac8b37af7fd 100644 (file)
--- 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 c08724faf3379c85376d75e70e6c4382d101937f..a67d7c11cf59a7061fb73f67549a2eac76ac8071 100644 (file)
--- 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