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 DCA4AA0350 for ; Mon, 21 Feb 2022 16:40:47 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D642C4013F; Mon, 21 Feb 2022 16:40:47 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 860994013F for ; Mon, 21 Feb 2022 16:40:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g0wZBv7rCGVydnCZ+3Ae9XZk+iX+pQnkwWbXjw+0eRY=; b=eqT3MAehccCIce+pZcWhQ7Lf/pzVa2oHMbJFXfZsbdvdXo30ZuJvxZ0f1DRIK0cfGJ34ca znBTG+t3PG2CNCzd/0FpMNBh1iy/SiNHG4ovsCyAiHNFr9x8HV7OvvkcsWUkXSIGAJAsBX tcOoc9c6/kvlOCQV2q6wtPR/wDSiU3M= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-65-kMv3f8H5PEu_JkwJoaEFQg-1; Mon, 21 Feb 2022 10:40:40 -0500 X-MC-Unique: kMv3f8H5PEu_JkwJoaEFQg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D300D8144E4; Mon, 21 Feb 2022 15:40:39 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9093B7B9D9; Mon, 21 Feb 2022 15:40:38 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Jerin Jacob , dpdk stable Subject: patch 'build: remove deprecated Meson functions' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:35:09 +0000 Message-Id: <20220221153625.152324-120-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 Hi, FYI, your patch has been queued to stable release 21.11.1 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/26/22. So please shout if anyone has objections. 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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/4f140c9a9a5ab5baabc6508de843852d959183db Thanks. Kevin --- >From 4f140c9a9a5ab5baabc6508de843852d959183db 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 [ upstream commit e16b972b1afe2444346016175ae086d5bea54016 ] 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. 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 Bugzilla ID: 926 Signed-off-by: Bruce Richardson Tested-by: Jerin Jacob --- doc/api/meson.build | 10 +++++----- kernel/freebsd/meson.build | 4 ++-- kernel/linux/kni/meson.build | 8 ++++---- meson.build | 2 ++ 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/doc/api/meson.build b/doc/api/meson.build index 7e2b429ac8..5c25b92092 100644 --- a/doc/api/meson.build +++ b/doc/api/meson.build @@ -25,5 +25,5 @@ htmldir = join_paths(get_option('datadir'), 'doc', 'dpdk') example = 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'), @@ -33,9 +33,9 @@ example = custom_target('examples.dox', cdata = 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') diff --git a/kernel/freebsd/meson.build b/kernel/freebsd/meson.build index bf5aa20a55..1f612711be 100644 --- a/kernel/freebsd/meson.build +++ b/kernel/freebsd/meson.build @@ -10,6 +10,6 @@ kmods = ['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 = ['-I' + meson.build_root(), - '-I' + join_paths(meson.source_root(), 'config'), +kmod_cflags = ['-I' + dpdk_build_root, + '-I' + join_paths(dpdk_source_root, 'config'), '-include rte_config.h'] diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build index dae8c37b37..4c90069e99 100644 --- a/kernel/linux/kni/meson.build +++ b/kernel/linux/kni/meson.build @@ -30,8 +30,8 @@ custom_target('rte_kni', 'src=' + meson.current_source_dir(), ' '.join(['MODULE_CFLAGS=', 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, diff --git a/meson.build b/meson.build index 1223b79d74..21dc51f00d 100644 --- a/meson.build +++ b/meson.build @@ -28,4 +28,6 @@ endif # set up some global vars for compiler, platform, configuration, etc. cc = meson.get_compiler('c') +dpdk_source_root = meson.current_source_dir() +dpdk_build_root = meson.current_build_dir() dpdk_conf = configuration_data() dpdk_libraries = [] -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:47.215009897 +0000 +++ 0120-build-remove-deprecated-Meson-functions.patch 2022-02-21 15:22:44.249704482 +0000 @@ -1 +1 @@ -From e16b972b1afe2444346016175ae086d5bea54016 Mon Sep 17 00:00:00 2001 +From 4f140c9a9a5ab5baabc6508de843852d959183db Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e16b972b1afe2444346016175ae086d5bea54016 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -87 +88 @@ -index 3d97e96f38..937f6110c0 100644 +index 1223b79d74..21dc51f00d 100644 @@ -90 +91 @@ -@@ -32,4 +32,6 @@ endif +@@ -28,4 +28,6 @@ endif