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 186E85F16 for ; Thu, 7 Mar 2019 14:02:03 +0100 (CET) X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Mar 2019 05:02:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,451,1544515200"; d="scan'208";a="149472210" Received: from bricha3-mobl.ger.corp.intel.com ([10.237.221.36]) by fmsmga002.fm.intel.com with SMTP; 07 Mar 2019 05:02:00 -0800 Received: by (sSMTP sendmail emulation); Thu, 07 Mar 2019 13:01:59 +0000 Date: Thu, 7 Mar 2019 13:01:59 +0000 From: Bruce Richardson To: David Marchand Cc: dev Message-ID: <20190307130159.GA483740@bricha3-MOBL.ger.corp.intel.com> References: <20190307115448.54041-1-bruce.richardson@intel.com> <20190307115448.54041-3-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.2 (2019-01-07) Subject: Re: [dpdk-dev] [PATCH 2/4] build: use version number from config file X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Mar 2019 13:02:04 -0000 On Thu, Mar 07, 2019 at 01:37:08PM +0100, David Marchand wrote: > On Thu, Mar 7, 2019 at 12:55 PM Bruce Richardson > <[1]bruce.richardson@intel.com> wrote: > > 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. > Signed-off-by: Bruce Richardson <[2]bruce.richardson@intel.com> > --- > DPDK_VERSION | 2 +- > config/common_base | 14 +++++++++ > config/rte_config.h | 5 ++++ > lib/librte_eal/common/include/rte_version.h | 32 > --------------------- > meson.build | 14 +++++++++ > mk/[3]rte.sdkconfig.mk | 2 ++ > 6 files changed, 36 insertions(+), 33 deletions(-) > diff --git a/DPDK_VERSION b/DPDK_VERSION > index c4a4cd00b..e013b54dd 100644 > --- a/DPDK_VERSION > +++ b/DPDK_VERSION > @@ -1 +1 @@ > -19.05.0-rc0 > +19.05.1 > > Might be a bit early for the stable while the 19.05 is still being > cooked :-) > Oops, didn't realise that testing change had crept in. > diff --git a/config/common_base b/config/common_base > index 0b09a9348..6292bc4af 100644 > --- a/config/common_base > +++ b/config/common_base > @@ -1,6 +1,20 @@ > # SPDX-License-Identifier: BSD-3-Clause > # Copyright(c) 2010-2017 Intel Corporation > +# > +# String that appears before the version number > +# > +CONFIG_RTE_VER_PREFIX="DPDK" > + > +# > +# Version information completed when this file is processed for a > build > +# > +CONFIG_RTE_VER_YEAR=__YEAR > +CONFIG_RTE_VER_MONTH=__MONTH > +CONFIG_RTE_VER_MINOR=__MINOR > +CONFIG_RTE_VER_SUFFIX=__SUFFIX > +CONFIG_RTE_VER_RELEASE=__RELEASE > + > > ? > I think you broke make support. Well, yes and no. It should be fine if you remove the build directory and recreate it, as the code for generating the build config has changed. /Bruce