From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id DBEFA1DCBE; Thu, 14 Jun 2018 12:40:35 +0200 (CEST) X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Jun 2018 03:40:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,222,1526367600"; d="scan'208";a="49844193" Received: from bricha3-mobl.ger.corp.intel.com ([10.237.221.107]) by orsmga006.jf.intel.com with SMTP; 14 Jun 2018 03:40:31 -0700 Received: by (sSMTP sendmail emulation); Thu, 14 Jun 2018 11:40:30 +0100 Date: Thu, 14 Jun 2018 11:40:30 +0100 From: Bruce Richardson To: Gavin Hu Cc: dev@dpdk.org, stable@dpdk.org Message-ID: <20180614104030.GC17264@bricha3-MOBL.ger.corp.intel.com> References: <1527590616-28299-1-git-send-email-gavin.hu@arm.com> <20180614095127.16245-1-gavin.hu@arm.com> <20180614095127.16245-6-gavin.hu@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180614095127.16245-6-gavin.hu@arm.com> Organization: Intel Research and Development Ireland Ltd. User-Agent: Mutt/1.10.0 (2018-05-17) Subject: Re: [dpdk-dev] [PATCH v6 5/7] devtools: fix the missing ninja command error on CentOS X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jun 2018 10:40:37 -0000 On Thu, Jun 14, 2018 at 05:51:25PM +0800, Gavin Hu wrote: > On CentOS, the ninja executable has a different name: > ninja-build, this patch is to fix the missing command error > on CentOS as follows: > ./devtools/test-meson-builds.sh: line 24: ninja: command not found > > Fixes: a55277a788 ("devtools: add test script for meson builds") > Cc: stable@dpdk.org > > Signed-off-by: Gavin Hu > Reviewed-by: Phil Yang > Reviewed-by: Song Zhu > --- > devtools/test-meson-builds.sh | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh > index 6bce3df7f..4afac76dd 100755 > --- a/devtools/test-meson-builds.sh > +++ b/devtools/test-meson-builds.sh > @@ -21,7 +21,11 @@ build () # > $MESON $options $srcdir $builddir > fi > echo "ninja -C $builddir" > - ninja -C $builddir > + if [ "$(lsb_release -d | grep -c 'CentOS')" != "0" ] ; then > + ninja-build -C $builddir > + else > + ninja -C $builddir > + fi > } Rather than tying this to CentOS explicitly, would it be better at the start of the script to test e.g "which ninja" and "which ninja-build" and use that to work out the command to use. It's possible to have ninja installed directly from tarball on CentOS as "ninja" (as I have in my test VM), and the binary might be called ninja-build on other systems too e.g. RHEL, perhaps. /Bruce