[dpdk-stable] patch 'build: exclude meson files from examples installation' has been queued to stable release 19.11.9

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.9

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

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/93d076ea808e29f1debc26169987328dbdc38287

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 93d076ea808e29f1debc26169987328dbdc38287 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Fri, 12 Mar 2021 14:56:05 +0000
Subject: [PATCH] build: exclude meson files from examples installation

[ upstream commit 5d20515e0c260377fcd23fab785070c4391cc59d ]

The meson.build files in each example directory is simply to support
building the example as part of the main SDK build, and these should not
be installed with the example's source code and makefile. The exclude of
"meson.build" only filters out the top-level examples/meson.build file,
not the file in each subdirectory.

To fix this, we can build up the list of files to exclude based off the
list of all examples. With this change "find examples/ -name meson.build"
returns no hits when run on an installed instance.

Fixes: e5b95003f1df ("examples: fix flattening directory layout on install")

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

diff --git a/examples/meson.build b/examples/meson.build
index 4dc292fbd1..59b4a014a0 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -47,6 +47,12 @@ all_examples = [
 	'vmdq', 'vmdq_dcb',
 ]
 
+# on install, skip copying all meson.build files
+ex_file_excludes = ['meson.build']
+foreach ex:all_examples
+	ex_file_excludes += [ex + '/meson.build']
+endforeach
+
 if get_option('examples') == ''
 	subdir_done()
 endif
diff --git a/meson.build b/meson.build
index 01bbb556ec..428b84d22f 100644
--- a/meson.build
+++ b/meson.build
@@ -50,7 +50,7 @@ subdir('doc')
 subdir('examples')
 install_subdir('examples',
 	install_dir: get_option('datadir') + '/dpdk',
-	exclude_files: 'meson.build')
+	exclude_files: ex_file_excludes)
 
 # build kernel modules if enabled
 if get_option('enable_kmods')
-- 
2.31.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-17 17:40:30.579470328 +0200
+++ 0026-build-exclude-meson-files-from-examples-installation.patch	2021-05-17 17:40:29.143809256 +0200
@@ -1 +1 @@
-From 5d20515e0c260377fcd23fab785070c4391cc59d Mon Sep 17 00:00:00 2001
+From 93d076ea808e29f1debc26169987328dbdc38287 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5d20515e0c260377fcd23fab785070c4391cc59d ]
+
@@ -17 +18,0 @@
-Cc: stable at dpdk.org
@@ -26 +27 @@
-index b9ab24223f..3fe08d4ca5 100644
+index 4dc292fbd1..59b4a014a0 100644
@@ -29 +30 @@
-@@ -48,6 +48,12 @@ all_examples = [
+@@ -47,6 +47,12 @@ all_examples = [
@@ -43 +44 @@
-index fcc4d4c900..7778e18200 100644
+index 01bbb556ec..428b84d22f 100644
@@ -46 +47 @@
-@@ -61,7 +61,7 @@ subdir('doc')
+@@ -50,7 +50,7 @@ subdir('doc')