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 802861B45E for ; Thu, 31 Jan 2019 16:50:00 +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 D374B88E65; Thu, 31 Jan 2019 15:49:59 +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 6162A5C207; Thu, 31 Jan 2019 15:49:58 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Luca Boccassi , dpdk stable Date: Thu, 31 Jan 2019 15:48:23 +0000 Message-Id: <20190131154901.5383-15-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.25]); Thu, 31 Jan 2019 15:49:59 +0000 (UTC) Subject: [dpdk-stable] patch 'devtools: fix build check for whether meson has run' 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:50:00 -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 951452235c5d10b1bfa4badf8e486c74a85e334f Mon Sep 17 00:00:00 2001 From: Bruce Richardson 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 Acked-by: Luca Boccassi --- 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 () # 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 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@dpdk.org Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi