[dpdk-stable] patch 'build: fix variable name in dependency error message' has been queued to LTS release 18.11.1

Kevin Traynor ktraynor at redhat.com
Thu Jan 31 16:48:22 CET 2019


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 <bruce.richardson at intel.com>
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 <bruce.richardson at intel.com>
Acked-by: Luca Boccassi <bluca at debian.org>
---
 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 <bruce.richardson at intel.com>
 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 at dpdk.org
 
 Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
 Acked-by: Luca Boccassi <bluca at debian.org>
@@ -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)


More information about the stable mailing list