From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id BE2FFE6D for ; Wed, 10 Feb 2016 18:03:45 +0100 (CET) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP; 10 Feb 2016 09:02:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,426,1449561600"; d="scan'208";a="909384682" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga002.jf.intel.com with ESMTP; 10 Feb 2016 09:02:24 -0800 Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id u1AH2MwV022361; Wed, 10 Feb 2016 17:02:22 GMT Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id u1AH2L5F005341; Wed, 10 Feb 2016 17:02:21 GMT Received: (from jmcnam2@localhost) by sivswdev02.ir.intel.com with id u1AH2LIJ005337; Wed, 10 Feb 2016 17:02:21 GMT From: John McNamara To: dev@dpdk.org Date: Wed, 10 Feb 2016 17:02:11 +0000 Message-Id: <1455123732-1705-1-git-send-email-john.mcnamara@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1450704384-9986-1-git-send-email-bruce.richardson@intel.com> References: <1450704384-9986-1-git-send-email-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v3 1/2] version: switch to year/month version numbers X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Feb 2016 17:03:46 -0000 From: "Richardson, Bruce" 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 Signed-off-by: John McNamara --- drivers/net/nfp/nfp_net.c | 2 -- lib/librte_eal/common/include/rte_version.h | 42 ++++++++++++++--------------- mk/rte.sdkconfig.mk | 2 +- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c index ffa5730..fd4dd39 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -1070,9 +1070,7 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) }; dev_info->reta_size = NFP_NET_CFG_RSS_ITBL_SZ; -#if RTE_VER_MAJOR == 2 && RTE_VER_MINOR >= 1 dev_info->hash_key_size = NFP_NET_CFG_RSS_KEY_SZ; -#endif } static uint32_t diff --git a/lib/librte_eal/common/include/rte_version.h b/lib/librte_eal/common/include/rte_version.h index 0baf130..779f17f 100644 --- a/lib/librte_eal/common/include/rte_version.h +++ b/lib/librte_eal/common/include/rte_version.h @@ -50,22 +50,22 @@ 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 + * Major version/year number i.e. the yy in yy.mm.z */ -#define RTE_VER_MAJOR 2 +#define RTE_VER_YEAR 16 /** - * Minor version number i.e. the y in x.y.z + * Minor version/month number i.e. the mm in yy.mm.z */ -#define RTE_VER_MINOR 3 +#define RTE_VER_MONTH 4 /** - * Patch level number i.e. the z in x.y.z + * Patch level number i.e. the z in yy.mm.z */ -#define RTE_VER_PATCH_LEVEL 0 +#define RTE_VER_MINOR 0 /** * Extra string to be appended to version number @@ -77,7 +77,7 @@ extern "C" { * 0-15 = release candidates * 16 = release */ -#define RTE_VER_PATCH_RELEASE 0 +#define RTE_VER_RELEASE 0 /** * Macro to compute a version number usable for comparisons @@ -88,10 +88,10 @@ extern "C" { * All version numbers in one to compare with RTE_VERSION_NUM() */ #define RTE_VERSION RTE_VERSION_NUM( \ - RTE_VER_MAJOR, \ + RTE_VER_YEAR, \ + RTE_VER_MONTH, \ RTE_VER_MINOR, \ - RTE_VER_PATCH_LEVEL, \ - RTE_VER_PATCH_RELEASE) + RTE_VER_RELEASE) /** * Function returning version string @@ -105,21 +105,21 @@ 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); + RTE_VER_YEAR, + RTE_VER_MONTH, + RTE_VER_MINOR); 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_YEAR, + RTE_VER_MONTH, RTE_VER_MINOR, - RTE_VER_PATCH_LEVEL, RTE_VER_SUFFIX, - RTE_VER_PATCH_RELEASE < 16 ? - RTE_VER_PATCH_RELEASE : - RTE_VER_PATCH_RELEASE - 16); + RTE_VER_RELEASE < 16 ? + RTE_VER_RELEASE : + RTE_VER_RELEASE - 16); return version; } 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