[v2,1/2] devtools: fix ninja install breakage under relative path
diff mbox series

Message ID 1600854012-10226-1-git-send-email-phil.yang@arm.com
State Deferred
Delegated to: David Marchand
Headers show
Series
  • [v2,1/2] devtools: fix ninja install breakage under relative path
Related show

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Phil Yang Sept. 23, 2020, 9:40 a.m. UTC
As the DESTDIR variable use as ninja's destination directory when invoking
ninja install. If the DESTDIR is not an absolute path, ninja complains.

Fixes: 777014e56d07 ("devtools: add ABI checks")
Cc: stable@dpdk.org

Signed-off-by: Phil Yang <phil.yang@arm.com>
---
v2:
Use readlink to ensure consistent coding style. (Juraj)

v1:
Initial version.

 devtools/test-meson-builds.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Juraj Linkeš Sept. 23, 2020, 10:12 a.m. UTC | #1
> -----Original Message-----
> From: Phil Yang <phil.yang@arm.com>
> Sent: Wednesday, September 23, 2020 11:40 AM
> To: dev@dpdk.org; david.marchand@redhat.com
> Cc: Juraj Linkeš <juraj.linkes@pantheon.tech>; Ruifeng.Wang@arm.com;
> nd@arm.com; stable@dpdk.org; Bruce Richardson
> <bruce.richardson@intel.com>; Luca Boccassi <bluca@debian.org>
> Subject: [PATCH v2 1/2] devtools: fix ninja install breakage under relative path
> 
> As the DESTDIR variable use as ninja's destination directory when invoking ninja
> install. If the DESTDIR is not an absolute path, ninja complains.
> 
> Fixes: 777014e56d07 ("devtools: add ABI checks")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Phil Yang <phil.yang@arm.com>
> ---
> v2:
> Use readlink to ensure consistent coding style. (Juraj)
> 
> v1:
> Initial version.
> 
>  devtools/test-meson-builds.sh | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index
> a87de63..5236b9c 100755
> --- a/devtools/test-meson-builds.sh
> +++ b/devtools/test-meson-builds.sh
> @@ -143,7 +143,8 @@ build () # <directory> <target compiler | cross file>
> <meson options>
>  	config $srcdir $builds_dir/$targetdir $cross --werror $*
>  	compile $builds_dir/$targetdir
>  	if [ -n "$DPDK_ABI_REF_VERSION" ]; then
> -		abirefdir=${DPDK_ABI_REF_DIR:-
> reference}/$DPDK_ABI_REF_VERSION
> +		abirefdir=$(readlink -f \
> +			${DPDK_ABI_REF_DIR:-
> reference}/$DPDK_ABI_REF_VERSION)
>  		if [ ! -d $abirefdir/$targetdir ]; then
>  			# clone current sources
>  			if [ ! -d $abirefdir/src ]; then
> --
> 2.7.4
> 

Reviewed-by: Juraj Linkeš <juraj.linkes@pantheon.tech>

Patch
diff mbox series

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index a87de63..5236b9c 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -143,7 +143,8 @@  build () # <directory> <target compiler | cross file> <meson options>
 	config $srcdir $builds_dir/$targetdir $cross --werror $*
 	compile $builds_dir/$targetdir
 	if [ -n "$DPDK_ABI_REF_VERSION" ]; then
-		abirefdir=${DPDK_ABI_REF_DIR:-reference}/$DPDK_ABI_REF_VERSION
+		abirefdir=$(readlink -f \
+			${DPDK_ABI_REF_DIR:-reference}/$DPDK_ABI_REF_VERSION)
 		if [ ! -d $abirefdir/$targetdir ]; then
 			# clone current sources
 			if [ ! -d $abirefdir/src ]; then