[dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/42c9b85315164d8c78037edf13511fae532eeee2

Thanks.

Kevin.

---
>From 42c9b85315164d8c78037edf13511fae532eeee2 Mon Sep 17 00:00:00 2001
From: Timothy Redaelli <tredaelli at redhat.com>
Date: Wed, 1 Jul 2020 19:16:38 +0200
Subject: [PATCH] test: fix rpath for drivers with meson

[ upstream commit f62093e7390d39c160205a4915ce0b4de116a0c3 ]

This commit fixes the setting of relative rpath on dpdk-test for
drivers ($libdir/dpdk/pmd-$abiver) to the correct absolute rpath
($prefix$libdir/dpdk/pmd-$abiver).

Fixes: b5dc795a8a55 ("test: build app with meson as dpdk-test")

Signed-off-by: Timothy Redaelli <tredaelli at redhat.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 test/test/meson.build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/test/meson.build b/test/test/meson.build
index c097840f65..09b51a7ca6 100644
--- a/test/test/meson.build
+++ b/test/test/meson.build
@@ -288,5 +288,6 @@ if get_option('tests')
 		dependencies: test_dep_objs,
 		c_args: [cflags, '-DALLOW_EXPERIMENTAL_API'],
-		install_rpath: driver_install_path,
+		install_rpath: join_paths(get_option('prefix'),
+		                 driver_install_path),
 		install: true)
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:15.889435614 +0100
+++ 0001-test-fix-rpath-for-drivers-with-meson.patch	2020-08-20 16:26:15.749323644 +0100
@@ -1 +1 @@
-From f62093e7390d39c160205a4915ce0b4de116a0c3 Mon Sep 17 00:00:00 2001
+From 42c9b85315164d8c78037edf13511fae532eeee2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f62093e7390d39c160205a4915ce0b4de116a0c3 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -16 +17 @@
- app/test/meson.build | 3 ++-
+ test/test/meson.build | 3 ++-
@@ -19,11 +20,11 @@
-diff --git a/app/test/meson.build b/app/test/meson.build
-index 56591db4e0..39f295d737 100644
---- a/app/test/meson.build
-+++ b/app/test/meson.build
-@@ -426,5 +426,6 @@ dpdk_test = executable('dpdk-test',
- 	dependencies: test_dep_objs,
- 	c_args: cflags,
--	install_rpath: driver_install_path,
-+	install_rpath: join_paths(get_option('prefix'),
-+			 driver_install_path),
- 	install: true)
+diff --git a/test/test/meson.build b/test/test/meson.build
+index c097840f65..09b51a7ca6 100644
+--- a/test/test/meson.build
++++ b/test/test/meson.build
+@@ -288,5 +288,6 @@ if get_option('tests')
+ 		dependencies: test_dep_objs,
+ 		c_args: [cflags, '-DALLOW_EXPERIMENTAL_API'],
+-		install_rpath: driver_install_path,
++		install_rpath: join_paths(get_option('prefix'),
++		                 driver_install_path),
+ 		install: true)