From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 8DB5DA00E6 for ; Tue, 16 Apr 2019 16:39:02 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7F8581B4D3; Tue, 16 Apr 2019 16:39:02 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 02CE31B4EE for ; Tue, 16 Apr 2019 16:39:01 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6987430ADBB8; Tue, 16 Apr 2019 14:39:00 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-214.ams2.redhat.com [10.36.117.214]) by smtp.corp.redhat.com (Postfix) with ESMTP id 865811001DE0; Tue, 16 Apr 2019 14:38:58 +0000 (UTC) From: Kevin Traynor To: Jerin Jacob Cc: Luca Boccassi , dpdk stable Date: Tue, 16 Apr 2019 15:37:08 +0100 Message-Id: <20190416143719.21601-50-ktraynor@redhat.com> In-Reply-To: <20190416143719.21601-1-ktraynor@redhat.com> References: <20190416143719.21601-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Tue, 16 Apr 2019 14:39:00 +0000 (UTC) Subject: [dpdk-stable] patch 'build: remove meson warning for Arm' has been queued to LTS release 18.11.2 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 Acked-by: Luca Boccassi --- 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 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@dpdk.org Signed-off-by: Jerin Jacob Acked-by: Luca Boccassi @@ -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')