From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id CF4DD1B455 for ; Thu, 31 Jan 2019 16:49:58 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 292EE804F8; Thu, 31 Jan 2019 15:49:58 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-200.ams2.redhat.com [10.36.117.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id DA7B05C207; Thu, 31 Jan 2019 15:49:54 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Luca Boccassi , dpdk stable Date: Thu, 31 Jan 2019 15:48:22 +0000 Message-Id: <20190131154901.5383-14-ktraynor@redhat.com> In-Reply-To: <20190131154901.5383-1-ktraynor@redhat.com> References: <20190131154901.5383-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 31 Jan 2019 15:49:58 +0000 (UTC) Subject: [dpdk-stable] patch 'build: fix variable name in dependency error message' has been queued to LTS release 18.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2019 15:49:59 -0000 Hi, FYI, your patch has been queued to LTS release 18.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/07/19. 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. Thanks. Kevin Traynor --- >>From bd235b9741a4de1eec2c9f7f18ebdedc5fafa2cd Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 10 Jan 2019 10:29:19 +0000 Subject: [PATCH] build: fix variable name in dependency error message [ upstream commit efa8088663e3917780f9cb257f2366743e9bfe2f ] The variable name in the error message had an extra '_' which caused an actual meson error when the message would otherwise be printed to give meaningful information about what was going wrong. Fixes: 203b61dc5e18 ("build: improve error message for missing dependency") Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- lib/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/meson.build b/lib/meson.build index bb7f443f9..df4226c51 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -80,5 +80,5 @@ foreach l:libraries if not is_variable('shared_rte_' + d) error('Missing dependency ' + d + - ' for library ' + lib_name) + ' for library ' + libname) endif shared_deps += [get_variable('shared_rte_' + d)] -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-31 15:44:06.074503364 +0000 +++ 0014-build-fix-variable-name-in-dependency-error-message.patch 2019-01-31 15:44:05.000000000 +0000 @@ -1,14 +1,15 @@ -From efa8088663e3917780f9cb257f2366743e9bfe2f Mon Sep 17 00:00:00 2001 +From bd235b9741a4de1eec2c9f7f18ebdedc5fafa2cd Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 10 Jan 2019 10:29:19 +0000 Subject: [PATCH] build: fix variable name in dependency error message +[ upstream commit efa8088663e3917780f9cb257f2366743e9bfe2f ] + The variable name in the error message had an extra '_' which caused an actual meson error when the message would otherwise be printed to give meaningful information about what was going wrong. Fixes: 203b61dc5e18 ("build: improve error message for missing dependency") -Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi @@ -17,10 +18,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/meson.build b/lib/meson.build -index 179c2ef37..e8b40f546 100644 +index bb7f443f9..df4226c51 100644 --- a/lib/meson.build +++ b/lib/meson.build -@@ -82,5 +82,5 @@ foreach l:libraries +@@ -80,5 +80,5 @@ foreach l:libraries if not is_variable('shared_rte_' + d) error('Missing dependency ' + d + - ' for library ' + lib_name)