[dpdk-stable] patch 'build: remove meson warning for Arm' has been queued to LTS release 18.11.2

Kevin Traynor ktraynor at redhat.com
Tue Apr 16 16:37:08 CEST 2019


Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 04/24/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 165e940fea85067a46cb8d84a1946b1b8b1489ff Mon Sep 17 00:00:00 2001
From: Jerin Jacob <jerinj at marvell.com>
Date: Tue, 19 Mar 2019 17:22:20 +0000
Subject: [PATCH] build: remove meson warning for Arm

[ upstream commit f6188bb8b0a7567d581023bfd91655bc668464d4 ]

Remove the following warning by comparing string to string.

config/arm/meson.build:153: WARNING: Trying to compare values of
different types (list, str) using ==.

Fixes: c6e536e38437 ("build: add more implementers IDs and PNs for ARM")

Signed-off-by: Jerin Jacob <jerinj at marvell.com>
Acked-by: Luca Boccassi <bluca at debian.org>
---
 config/arm/meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/arm/meson.build b/config/arm/meson.build
index dae55d6b2..45b611151 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -116,6 +116,6 @@ else
 		endif
 		# Set to generic if variable is not found
-		machine = get_variable('impl_' + cmd_output[0], 'generic')
-		if machine == 'generic'
+		machine = get_variable('impl_' + cmd_output[0], ['generic'])
+		if machine[0] == 'generic'
 			machine = impl_generic
 			cmd_output = cmd_generic
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-16 15:34:27.442194237 +0100
+++ 0050-build-remove-meson-warning-for-Arm.patch	2019-04-16 15:34:25.230178840 +0100
@@ -1,15 +1,16 @@
-From f6188bb8b0a7567d581023bfd91655bc668464d4 Mon Sep 17 00:00:00 2001
+From 165e940fea85067a46cb8d84a1946b1b8b1489ff Mon Sep 17 00:00:00 2001
 From: Jerin Jacob <jerinj at marvell.com>
 Date: Tue, 19 Mar 2019 17:22:20 +0000
 Subject: [PATCH] build: remove meson warning for Arm
 
+[ upstream commit f6188bb8b0a7567d581023bfd91655bc668464d4 ]
+
 Remove the following warning by comparing string to string.
 
 config/arm/meson.build:153: WARNING: Trying to compare values of
 different types (list, str) using ==.
 
 Fixes: c6e536e38437 ("build: add more implementers IDs and PNs for ARM")
-Cc: stable at dpdk.org
 
 Signed-off-by: Jerin Jacob <jerinj at marvell.com>
 Acked-by: Luca Boccassi <bluca at debian.org>
@@ -18,10 +19,10 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/config/arm/meson.build b/config/arm/meson.build
-index 8e892fa77..170a4981a 100644
+index dae55d6b2..45b611151 100644
 --- a/config/arm/meson.build
 +++ b/config/arm/meson.build
-@@ -117,6 +117,6 @@ else
+@@ -116,6 +116,6 @@ else
  		endif
  		# Set to generic if variable is not found
 -		machine = get_variable('impl_' + cmd_output[0], 'generic')


More information about the stable mailing list