[dpdk-stable] patch 'devtools: fix x86-default build test install env' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/19/20. 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.

Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/936f6422d6812938de88b5084140b34e0b6bb314

Thanks.

Luca Boccassi

---
>From 936f6422d6812938de88b5084140b34e0b6bb314 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Thu, 12 Nov 2020 14:38:43 +0100
Subject: [PATCH] devtools: fix x86-default build test install env

[ upstream commit 252e92eec4f3ba97884bf9424a607a07729c7c33 ]

The x86-default environment was loaded after installing this target.
I did not see any problem with it, yet we should load corresponding
environment before installing a target.

Fixes: bd253daa7717 ("devtools: fix test of ninja install")

Signed-off-by: David Marchand <david.marchand at redhat.com>
---
 devtools/test-meson-builds.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index 0971fe59c4..8678a3d824 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -135,14 +135,12 @@ done
 
 # Test installation of the x86-default target, to be used for checking
 # the sample apps build using the pkg-config file for cflags and libs
+load_env cc
 build_path=$(readlink -f $builds_dir/build-x86-default)
 export DESTDIR=$build_path/install-root
 $ninja_cmd -C $build_path install
-
-load_env cc
 pc_file=$(find $DESTDIR -name libdpdk.pc)
 export PKG_CONFIG_PATH=$(dirname $pc_file):$PKG_CONFIG_PATH
-
 # if pkg-config defines the necessary flags, test building some examples
 if pkg-config --define-prefix libdpdk >/dev/null 2>&1; then
 	export PKGCONF="pkg-config --define-prefix"
-- 
2.27.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-17 11:13:13.090520100 +0000
+++ 0002-devtools-fix-x86-default-build-test-install-env.patch	2020-11-17 11:13:12.857115320 +0000
@@ -1 +1 @@
-From 252e92eec4f3ba97884bf9424a607a07729c7c33 Mon Sep 17 00:00:00 2001
+From 936f6422d6812938de88b5084140b34e0b6bb314 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 252e92eec4f3ba97884bf9424a607a07729c7c33 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index f1ef8eaeb6..af750b3f3a 100755
+index 0971fe59c4..8678a3d824 100755
@@ -22 +23 @@
-@@ -255,17 +255,15 @@ done
+@@ -135,14 +135,12 @@ done
@@ -28,5 +29,2 @@
- export DESTDIR=$build_path/install
- # No need to reinstall if ABI checks are enabled
- if [ -z "$DPDK_ABI_REF_VERSION" ]; then
- 	install_target $build_path $DESTDIR
- fi
+ export DESTDIR=$build_path/install-root
+ $ninja_cmd -C $build_path install