[dpdk-stable] patch 'examples: fix flattening directory layout on install' 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/44b8800491dd3b28d752995188f158e95e7d24fb

Thanks.

Luca Boccassi

---
>From 44b8800491dd3b28d752995188f158e95e7d24fb Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Thu, 12 Nov 2020 09:41:39 +0000
Subject: [PATCH] examples: fix flattening directory layout on install

[ upstream commit e5b95003f1df2ac65cbd11e642b1d6a91bd1058a ]

By installing the examples one-by-one in a loop in the examples
meson.build file we effectively flattened out the structure of the examples
folder and omitted some common and shared subfolders that were never
directly built.  Instead, we can remove the loop and just have the whole
"examples" folder installed as-is in a single statement, preserving its
directory structure, and thereby fixing the build of a number of the
examples.

Fixes: 2daf565f91b5 ("examples: install as part of ninja install")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
---
 examples/meson.build | 7 -------
 meson.build          | 3 +++
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/examples/meson.build b/examples/meson.build
index ec6bd5a080..eeeb217ada 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -46,13 +46,6 @@ all_examples = [
 	'vm_power_manager/guest_cli',
 	'vmdq', 'vmdq_dcb',
 ]
-# install all example code on install - irrespective of whether the example in
-# question is to be built as part of this build or not.
-foreach ex:all_examples
-	install_subdir(ex,
-			install_dir: get_option('datadir') + '/dpdk/examples',
-			exclude_files: 'meson.build')
-endforeach
 
 if get_option('examples') == ''
 	subdir_done()
diff --git a/meson.build b/meson.build
index 41b1beb980..00949de995 100644
--- a/meson.build
+++ b/meson.build
@@ -48,6 +48,9 @@ subdir('doc')
 # build any examples explicitly requested - useful for developers - and
 # install any example code into the appropriate install path
 subdir('examples')
+install_subdir('examples',
+	install_dir: get_option('datadir') + '/dpdk',
+	exclude_files: 'meson.build')
 
 # build kernel modules if enabled
 if get_option('enable_kmods')
-- 
2.27.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-17 11:13:13.129238801 +0000
+++ 0003-examples-fix-flattening-directory-layout-on-install.patch	2020-11-17 11:13:12.861115401 +0000
@@ -1 +1 @@
-From e5b95003f1df2ac65cbd11e642b1d6a91bd1058a Mon Sep 17 00:00:00 2001
+From 44b8800491dd3b28d752995188f158e95e7d24fb Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e5b95003f1df2ac65cbd11e642b1d6a91bd1058a ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index f179955325..46ec80919e 100644
+index ec6bd5a080..eeeb217ada 100644
@@ -27 +28 @@
-@@ -47,13 +47,6 @@ all_examples = [
+@@ -46,13 +46,6 @@ all_examples = [
@@ -42 +43 @@
-index 61d9a4f5fa..45d974cd2c 100644
+index 41b1beb980..00949de995 100644
@@ -45 +46 @@
-@@ -59,6 +59,9 @@ subdir('doc')
+@@ -48,6 +48,9 @@ subdir('doc')