[dpdk-stable] patch 'devtools: fix build check for whether meson has run' has been queued to LTS release 18.11.1

[Kevin Traynor]

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 951452235c5d10b1bfa4badf8e486c74a85e334f Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Thu, 10 Jan 2019 10:37:26 +0000
Subject: [PATCH] devtools: fix build check for whether meson has run

[ upstream commit 85e5fd8be0c1f5ad07870b1d4dfba11cd6f27cdd ]

The current check to see whether we need to call meson or just ninja
simply checked if the build directory existed. However, if meson was run
but failed, the build directory would still exist. We can fix this by
instead checking for the build.ninja file inside the directory. Once that
is present, we can use ninja safely and let it worry about rerunning
meson if necessary.

Fixes: a55277a788df ("devtools: add test script for meson builds")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Luca Boccassi <bluca at debian.org>
---
 devtools/test-meson-builds.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index 79109b757..3edc805f6 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -25,5 +25,5 @@ build () # <directory> <meson options>
 	builddir=$1
 	shift
-	if [ ! -d "$builddir" ] ; then
+	if [ ! -f "$builddir/build.ninja" ] ; then
 		options="--werror -Dexamples=all $*"
 		echo "$MESON $options $srcdir $builddir"
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-31 15:44:06.096767770 +0000
+++ 0015-devtools-fix-build-check-for-whether-meson-has-run.patch	2019-01-31 15:44:05.000000000 +0000
@@ -1,8 +1,10 @@
-From 85e5fd8be0c1f5ad07870b1d4dfba11cd6f27cdd Mon Sep 17 00:00:00 2001
+From 951452235c5d10b1bfa4badf8e486c74a85e334f Mon Sep 17 00:00:00 2001
 From: Bruce Richardson <bruce.richardson at intel.com>
 Date: Thu, 10 Jan 2019 10:37:26 +0000
 Subject: [PATCH] devtools: fix build check for whether meson has run
 
+[ upstream commit 85e5fd8be0c1f5ad07870b1d4dfba11cd6f27cdd ]
+
 The current check to see whether we need to call meson or just ninja
 simply checked if the build directory existed. However, if meson was run
 but failed, the build directory would still exist. We can fix this by
@@ -11,7 +13,6 @@
 meson if necessary.
 
 Fixes: a55277a788df ("devtools: add test script for meson builds")
-Cc: stable at dpdk.org
 
 Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
 Acked-by: Luca Boccassi <bluca at debian.org>