From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 81FCBA0032 for ; Fri, 18 Feb 2022 14:17:02 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 765D740141; Fri, 18 Feb 2022 14:17:02 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id 77A2540141 for ; Fri, 18 Feb 2022 14:17:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1645190220; x=1676726220; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=DSmMZ4c91okSNuDePRIQFgH75Wb4pTdgM2zDJDR/0WA=; b=d1C+O8N5OQxtk1pRD1QOVDH0wrkYq4jri3ugyNJkcKG8AtZRyI4eFWJb 4syqXc29WA20/KYMCa6qgCjn1Dm16v6BoKDem5kqWiUKqeKNFNQhJfXxy d5feZ2LdJb742tak1OX1KjXC9gVjIK40NGlUQ6EVjvL4xYNJPuwzk8kab /aS+gx/r8qqNHZ5rza8H/vSiRuFPoloeqYz02nR8JyzyBcVYwQnk6gtey xscxnEO4iLtaQ8pMwArdjkUPNHRlYJhfD+5rBLfyCGAhGAteV0o76DUk2 Cg1M+Idr0cxFnw58QceqmK53Ddxg41tEEaFvTUuoALyJ4zC4HptO+Evdd A==; X-IronPort-AV: E=McAfee;i="6200,9189,10261"; a="248719352" X-IronPort-AV: E=Sophos;i="5.88,378,1635231600"; d="scan'208";a="248719352" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2022 05:16:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,378,1635231600"; d="scan'208";a="635773666" Received: from irsmsx604.ger.corp.intel.com ([163.33.146.137]) by fmsmga002.fm.intel.com with ESMTP; 18 Feb 2022 05:16:58 -0800 Received: from irsmsx601.ger.corp.intel.com (163.33.146.7) by IRSMSX604.ger.corp.intel.com (163.33.146.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Fri, 18 Feb 2022 13:16:58 +0000 Received: from irsmsx601.ger.corp.intel.com ([163.33.146.7]) by irsmsx601.ger.corp.intel.com ([163.33.146.7]) with mapi id 15.01.2308.020; Fri, 18 Feb 2022 13:16:58 +0000 From: "Richardson, Bruce" To: "luca.boccassi@gmail.com" CC: Jerin Jacob , dpdk stable Subject: RE: patch 'build: remove deprecated Meson functions' has been queued to stable release 20.11.5 Thread-Topic: patch 'build: remove deprecated Meson functions' has been queued to stable release 20.11.5 Thread-Index: AQHYJMUW0NP4WoOkA0K8VoibhILEmayZSd1g Date: Fri, 18 Feb 2022 13:16:57 +0000 Message-ID: <75228eb697e54c4db47b89a4e38df52f@intel.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> <20220218123931.1749595-70-luca.boccassi@gmail.com> In-Reply-To: <20220218123931.1749595-70-luca.boccassi@gmail.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.6.200.16 dlp-product: dlpe-windows dlp-reaction: no-action x-originating-ip: [163.33.253.164] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Again, I'm not sure this needs backport, as it's unlikely the deprecated fu= nctions will be removed in the near future. As before, I'll defer to your j= udgement as to the risk, if any. > -----Original Message----- > From: luca.boccassi@gmail.com > Sent: Friday, February 18, 2022 12:39 PM > To: Richardson, Bruce > Cc: Jerin Jacob ; dpdk stable > Subject: patch 'build: remove deprecated Meson functions' has been queued > to stable release 20.11.5 >=20 > Hi, >=20 > FYI, your patch has been queued to stable release 20.11.5 >=20 > Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. > It will be pushed if I get no objections before 02/20/22. So please > shout if anyone has objections. >=20 > Also note that after the patch there's a diff of the upstream commit vs > the > patch applied to the branch. This will indicate if there was any rebasing > needed to apply to the stable branch. If there were code changes for > rebasing > (ie: not only metadata diffs), please double check that the rebase was > correctly done. >=20 > Queued patches are on a temporary branch at: > https://github.com/bluca/dpdk-stable >=20 > This queued commit can be viewed at: > https://github.com/bluca/dpdk- > stable/commit/04a29bf8a81580ad1349654e3227a96822b5faa5 >=20 > Thanks. >=20 > Luca Boccassi >=20 > --- > From 04a29bf8a81580ad1349654e3227a96822b5faa5 Mon Sep 17 00:00:00 2001 > From: Bruce Richardson > Date: Mon, 24 Jan 2022 17:49:59 +0000 > Subject: [PATCH] build: remove deprecated Meson functions >=20 > [ upstream commit e16b972b1afe2444346016175ae086d5bea54016 ] >=20 > Starting in meson 0.56, the functions meson.source_root() and > meson.build_root() are deprecated and to be replaced by the [more > descriptive] functions: project_source_root()/global_source_root() and > project_build_root()/global_build_root(). Unfortunately, these new > replacement functions were only added in 0.56 release too, so to use > them we would need version checks for old/new functions to remove the > deprecation warnings. >=20 > However, the functions "current_build_dir()" and "current_source_dir()" > remain unaffected by all this, so we can bypass the versioning problem, > by saving off these values to "dpdk_source_root" and "dpdk_build_root" > in the top-level meson.build file >=20 > Bugzilla ID: 926 >=20 > Signed-off-by: Bruce Richardson > Tested-by: Jerin Jacob > --- > doc/api/meson.build | 10 +++++----- > kernel/freebsd/meson.build | 2 +- > kernel/linux/kni/meson.build | 8 ++++---- > meson.build | 2 ++ > 4 files changed, 12 insertions(+), 10 deletions(-) >=20 > diff --git a/doc/api/meson.build b/doc/api/meson.build > index 22d1bc204d..94e683455f 100644 > --- a/doc/api/meson.build > +++ b/doc/api/meson.build > @@ -24,7 +24,7 @@ htmldir =3D join_paths(get_option('datadir'), 'doc', > 'dpdk') > # So use a configure option for now. > example =3D custom_target('examples.dox', > output: 'examples.dox', > - command: [generate_examples, join_paths(meson.source_root(), > 'examples'), '@OUTPUT@'], > + command: [generate_examples, join_paths(dpdk_source_root, > 'examples'), '@OUTPUT@'], > depfile: 'examples.dox.d', > install: get_option('enable_docs'), > install_dir: htmldir, > @@ -32,11 +32,11 @@ example =3D custom_target('examples.dox', >=20 > cdata =3D configuration_data() > cdata.set('VERSION', meson.project_version()) > -cdata.set('API_EXAMPLES', join_paths(meson.build_root(), 'doc', 'api', > 'examples.dox')) > -cdata.set('OUTPUT', join_paths(meson.build_root(), 'doc', 'api')) > +cdata.set('API_EXAMPLES', join_paths(dpdk_build_root, 'doc', 'api', > 'examples.dox')) > +cdata.set('OUTPUT', join_paths(dpdk_build_root, 'doc', 'api')) > cdata.set('HTML_OUTPUT', 'html') > -cdata.set('TOPDIR', meson.source_root()) > -cdata.set('STRIP_FROM_PATH', ' '.join([meson.source_root(), > join_paths(meson.build_root(), 'doc', 'api')])) > +cdata.set('TOPDIR', dpdk_source_root) > +cdata.set('STRIP_FROM_PATH', ' '.join([dpdk_source_root, > join_paths(dpdk_build_root, 'doc', 'api')])) > cdata.set('WARN_AS_ERROR', 'NO') > if get_option('werror') > cdata.set('WARN_AS_ERROR', 'YES') > diff --git a/kernel/freebsd/meson.build b/kernel/freebsd/meson.build > index dc156a43fd..16a4e0b124 100644 > --- a/kernel/freebsd/meson.build > +++ b/kernel/freebsd/meson.build > @@ -10,7 +10,7 @@ kmods =3D ['contigmem', 'nic_uio'] > # files from the individual meson.build files, and then use a custom > # target to call make, passing in the values as env parameters. > kmod_cflags =3D ['-I' + meson.build_root(), > - '-I' + join_paths(meson.source_root(), 'config'), > + '-I' + join_paths(dpdk_source_root, 'config'), > '-include rte_config.h'] >=20 > # to avoid warnings due to race conditions with creating the dev_if.h, > etc. > diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build > index 1e642ec9d4..dab4f77df4 100644 > --- a/kernel/linux/kni/meson.build > +++ b/kernel/linux/kni/meson.build > @@ -28,10 +28,10 @@ custom_target('rte_kni', > 'M=3D' + meson.current_build_dir(), > 'src=3D' + meson.current_source_dir(), > ' '.join(['MODULE_CFLAGS=3D', kmod_cflags,'-include ']) > - + meson.source_root() + '/config/rte_config.h' + > - ' -I' + meson.source_root() + '/lib/librte_eal/include' + > - ' -I' + meson.source_root() + '/lib/librte_kni' + > - ' -I' + meson.build_root() + > + + dpdk_source_root + '/config/rte_config.h' + > + ' -I' + dpdk_source_root + '/lib/librte_eal/include' + > + ' -I' + dpdk_source_root + '/lib/librte_kni' + > + ' -I' + dpdk_build_root + > ' -I' + meson.current_source_dir(), > 'modules'], > depends: kni_mkfile, > diff --git a/meson.build b/meson.build > index 8eeb0ff8d8..290d99cdf9 100644 > --- a/meson.build > +++ b/meson.build > @@ -17,6 +17,8 @@ project('DPDK', 'C', >=20 > # set up some global vars for compiler, platform, configuration, etc. > cc =3D meson.get_compiler('c') > +dpdk_source_root =3D meson.current_source_dir() > +dpdk_build_root =3D meson.current_build_dir() > dpdk_conf =3D configuration_data() > dpdk_libraries =3D [] > dpdk_static_libraries =3D [] > -- > 2.30.2 >=20 > --- > Diff of the applied patch vs upstream commit (please double-check if > non-empty: > --- > --- - 2022-02-18 12:37:40.672276767 +0000 > +++ 0070-build-remove-deprecated-Meson-functions.patch 2022-02-18 > 12:37:37.746793171 +0000 > @@ -1 +1 @@ > -From e16b972b1afe2444346016175ae086d5bea54016 Mon Sep 17 00:00:00 2001 > +From 04a29bf8a81580ad1349654e3227a96822b5faa5 Mon Sep 17 00:00:00 2001 > @@ -5,0 +6,2 @@ > +[ upstream commit e16b972b1afe2444346016175ae086d5bea54016 ] > + > @@ -20 +21,0 @@ > -Cc: stable@dpdk.org > @@ -26 +27 @@ > - kernel/freebsd/meson.build | 4 ++-- > + kernel/freebsd/meson.build | 2 +- > @@ -29 +30 @@ > - 4 files changed, 13 insertions(+), 11 deletions(-) > + 4 files changed, 12 insertions(+), 10 deletions(-) > @@ -32 +33 @@ > -index 7e2b429ac8..5c25b92092 100644 > +index 22d1bc204d..94e683455f 100644 > @@ -38,6 +39,6 @@ > - output: 'examples.dox', > -- command: [generate_examples, join_paths(meson.source_root(), > 'examples'), '@OUTPUT@'], > -+ command: [generate_examples, join_paths(dpdk_source_root, > 'examples'), '@OUTPUT@'], > - depfile: 'examples.dox.d', > - install: get_option('enable_docs'), > - install_dir: htmldir, > + output: 'examples.dox', > +- command: [generate_examples, join_paths(meson.source_root(), > 'examples'), '@OUTPUT@'], > ++ command: [generate_examples, join_paths(dpdk_source_root, > 'examples'), '@OUTPUT@'], > + depfile: 'examples.dox.d', > + install: get_option('enable_docs'), > + install_dir: htmldir, > @@ -59 +60 @@ > - cdata.set('WARN_AS_ERROR', 'YES') > + cdata.set('WARN_AS_ERROR', 'YES') > @@ -61 +62 @@ > -index bf5aa20a55..1f612711be 100644 > +index dc156a43fd..16a4e0b124 100644 > @@ -64,2 +65 @@ > -@@ -9,8 +9,8 @@ kmods =3D ['contigmem', 'nic_uio'] > - # right now, which allows us to simplify things. We pull in the sourcer > +@@ -10,7 +10,7 @@ kmods =3D ['contigmem', 'nic_uio'] > @@ -68,5 +68,4 @@ > --kmod_cflags =3D ['-I' + meson.build_root(), > -- '-I' + join_paths(meson.source_root(), 'config'), > -+kmod_cflags =3D ['-I' + dpdk_build_root, > -+ '-I' + join_paths(dpdk_source_root, 'config'), > - '-include rte_config.h'] > + kmod_cflags =3D ['-I' + meson.build_root(), > +- '-I' + join_paths(meson.source_root(), 'config'), > ++ '-I' + join_paths(dpdk_source_root, 'config'), > + '-include rte_config.h'] > @@ -76 +75 @@ > -index dae8c37b37..4c90069e99 100644 > +index 1e642ec9d4..dab4f77df4 100644 > @@ -79,15 +78,15 @@ > -@@ -29,10 +29,10 @@ custom_target('rte_kni', > - 'M=3D' + meson.current_build_dir(), > - 'src=3D' + meson.current_source_dir(), > - ' '.join(['MODULE_CFLAGS=3D', kmod_cflags,'-include ']) > -- + meson.source_root() + '/config/rte_config.h' + > -- ' -I' + meson.source_root() + '/lib/eal/include' + > -- ' -I' + meson.source_root() + '/lib/kni' + > -- ' -I' + meson.build_root() + > -+ + dpdk_source_root + '/config/rte_config.h' + > -+ ' -I' + dpdk_source_root + '/lib/eal/include' + > -+ ' -I' + dpdk_source_root + '/lib/kni' + > -+ ' -I' + dpdk_build_root + > - ' -I' + meson.current_source_dir(), > - 'modules'] + cross_args, > - depends: kni_mkfile, > +@@ -28,10 +28,10 @@ custom_target('rte_kni', > + 'M=3D' + meson.current_build_dir(), > + 'src=3D' + meson.current_source_dir(), > + ' '.join(['MODULE_CFLAGS=3D', kmod_cflags,'-include ']) > +- + meson.source_root() + '/config/rte_config.h' + > +- ' -I' + meson.source_root() + '/lib/librte_eal/include' + > +- ' -I' + meson.source_root() + '/lib/librte_kni' + > +- ' -I' + meson.build_root() + > ++ + dpdk_source_root + '/config/rte_config.h' + > ++ ' -I' + dpdk_source_root + '/lib/librte_eal/include' + > ++ ' -I' + dpdk_source_root + '/lib/librte_kni' + > ++ ' -I' + dpdk_build_root + > + ' -I' + meson.current_source_dir(), > + 'modules'], > + depends: kni_mkfile, > @@ -95 +94 @@ > -index 3d97e96f38..937f6110c0 100644 > +index 8eeb0ff8d8..290d99cdf9 100644 > @@ -98 +97 @@ > -@@ -31,6 +31,8 @@ endif > +@@ -17,6 +17,8 @@ project('DPDK', 'C',