[v11,4/6] devtools: fix the missing ninja command error
Checks
Commit Message
On some linux distributions, eg: CentOS, the ninja executable has a
different name: ninja-build, this patch is to check and adapt to it
accordingly.
./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 <gavin.hu@arm.com>
Reviewed-by: Phil Yang <phil.yang@arm.com>
Reviewed-by: Song Zhu <song.zhu@arm.com>
---
devtools/test-meson-builds.sh | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
Comments
On Tue, Jun 19, 2018 at 09:37:44AM +0800, Gavin Hu wrote:
> On some linux distributions, eg: CentOS, the ninja executable has a
> different name: ninja-build, this patch is to check and adapt to it
> accordingly.
>
> ./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 <gavin.hu@arm.com>
> Reviewed-by: Phil Yang <phil.yang@arm.com>
> Reviewed-by: Song Zhu <song.zhu@arm.com>
> ---
This is previously acked.
Hi Bruce,
Thanks for your review, I submitted v12 patch to address all your new comments.
BTW, do you know why pwclient can NOT work successfully today?
It worked fine at my side previously, any changes at the server side? The error is below:
xmlrpc.client.ProtocolError: <ProtocolError for dpdk.org/dev/patchwork/xmlrpc/: 301 Moved Permanently>
Best Regards,
Gavin
> -----Original Message-----
> From: Bruce Richardson <bruce.richardson@intel.com>
> Sent: Tuesday, June 19, 2018 6:12 PM
> To: Gavin Hu <Gavin.Hu@arm.com>
> Cc: dev@dpdk.org; nd <nd@arm.com>; stable@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v11 4/6] devtools: fix the missing ninja
> command error
>
> On Tue, Jun 19, 2018 at 09:37:44AM +0800, Gavin Hu wrote:
> > On some linux distributions, eg: CentOS, the ninja executable has a
> > different name: ninja-build, this patch is to check and adapt to it
> > accordingly.
> >
> > ./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 <gavin.hu@arm.com>
> > Reviewed-by: Phil Yang <phil.yang@arm.com>
> > Reviewed-by: Song Zhu <song.zhu@arm.com>
> > ---
> This is previously acked.
On Tue, Jun 19, 2018 at 10:41:06AM +0000, Gavin Hu wrote:
> Hi Bruce,
>
> Thanks for your review, I submitted v12 patch to address all your new comments.
>
> BTW, do you know why pwclient can NOT work successfully today?
> It worked fine at my side previously, any changes at the server side? The error is below:
> xmlrpc.client.ProtocolError: <ProtocolError for dpdk.org/dev/patchwork/xmlrpc/: 301 Moved Permanently>
>
> Best Regards,
> Gavin
Paths on the server have changed, so you need to update your .pwclientrc
file to point to the new path. Patchwork is now at "patches.dpdk.org"
>
> > -----Original Message-----
> > From: Bruce Richardson <bruce.richardson@intel.com>
> > Sent: Tuesday, June 19, 2018 6:12 PM
> > To: Gavin Hu <Gavin.Hu@arm.com>
> > Cc: dev@dpdk.org; nd <nd@arm.com>; stable@dpdk.org
> > Subject: Re: [dpdk-dev] [PATCH v11 4/6] devtools: fix the missing ninja
> > command error
> >
> > On Tue, Jun 19, 2018 at 09:37:44AM +0800, Gavin Hu wrote:
> > > On some linux distributions, eg: CentOS, the ninja executable has a
> > > different name: ninja-build, this patch is to check and adapt to it
> > > accordingly.
> > >
> > > ./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 <gavin.hu@arm.com>
> > > Reviewed-by: Phil Yang <phil.yang@arm.com>
> > > Reviewed-by: Song Zhu <song.zhu@arm.com>
> > > ---
> > This is previously acked.
Thanks Bruce, it works out with new url:
url=http://patches.dpdk.org/xmlrpc/
> -----Original Message-----
> From: Bruce Richardson <bruce.richardson@intel.com>
> Sent: Tuesday, June 19, 2018 8:30 PM
> To: Gavin Hu <Gavin.Hu@arm.com>
> Cc: dev@dpdk.org; nd <nd@arm.com>; stable@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v11 4/6] devtools: fix the missing ninja
> command error
>
> On Tue, Jun 19, 2018 at 10:41:06AM +0000, Gavin Hu wrote:
> > Hi Bruce,
> >
> > Thanks for your review, I submitted v12 patch to address all your new
> comments.
> >
> > BTW, do you know why pwclient can NOT work successfully today?
> > It worked fine at my side previously, any changes at the server side? The
> error is below:
> > xmlrpc.client.ProtocolError: <ProtocolError for
> > dpdk.org/dev/patchwork/xmlrpc/: 301 Moved Permanently>
> >
> > Best Regards,
> > Gavin
>
> Paths on the server have changed, so you need to update your .pwclientrc
> file to point to the new path. Patchwork is now at "patches.dpdk.org"
> >
> > > -----Original Message-----
> > > From: Bruce Richardson <bruce.richardson@intel.com>
> > > Sent: Tuesday, June 19, 2018 6:12 PM
> > > To: Gavin Hu <Gavin.Hu@arm.com>
> > > Cc: dev@dpdk.org; nd <nd@arm.com>; stable@dpdk.org
> > > Subject: Re: [dpdk-dev] [PATCH v11 4/6] devtools: fix the missing
> > > ninja command error
> > >
> > > On Tue, Jun 19, 2018 at 09:37:44AM +0800, Gavin Hu wrote:
> > > > On some linux distributions, eg: CentOS, the ninja executable has
> > > > a different name: ninja-build, this patch is to check and adapt to
> > > > it accordingly.
> > > >
> > > > ./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 <gavin.hu@arm.com>
> > > > Reviewed-by: Phil Yang <phil.yang@arm.com>
> > > > Reviewed-by: Song Zhu <song.zhu@arm.com>
> > > > ---
> > > This is previously acked.
@@ -10,6 +10,15 @@
srcdir=$(dirname $(readlink -m $0))/..
MESON=${MESON:-meson}
+if command -v ninja >/dev/null 2>&1 ; then
+ ninja_cmd=ninja
+elif command -v ninja-build >/dev/null 2>&1 ; then
+ ninja_cmd=ninja-build
+else
+ echo "## ERROR: ninja is missing, please install..."
+ exit 1
+fi
+
build () # <directory> <meson options>
{
builddir=$1
@@ -20,8 +29,8 @@ build () # <directory> <meson options>
$MESON $options $srcdir $builddir
unset CC
fi
- echo "ninja -C $builddir"
- ninja -C $builddir
+ echo "$ninja_cmd -C $builddir"
+ $ninja_cmd -C $builddir
}
# shared and static linked builds with gcc and clang