DPDK patches and discussions
 help / color / mirror / Atom feed
* [dpdk-dev] [PATCH] install: fix flattening of examples directory
@ 2020-11-10 17:08 Bruce Richardson
  2020-11-10 17:09 ` Bruce Richardson
                   ` (4 more replies)
  0 siblings, 5 replies; 27+ messages in thread
From: Bruce Richardson @ 2020-11-10 17:08 UTC (permalink / raw)
  To: dev; +Cc: david.marchand, Bruce Richardson, stable

By installing the examples one-by-one in a loop in the examples
meson.build file we effectively flatted 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")
Cc: stable@dpdk.org

Signed-off-by: Bruce Richardson <bruce.richardson@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 f17995532..46ec80919 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -47,13 +47,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 61d9a4f5f..45d974cd2 100644
--- a/meson.build
+++ b/meson.build
@@ -59,6 +59,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.25.1


^ permalink raw reply	[flat|nested] 27+ messages in thread

end of thread, other threads:[~2020-11-12 18:36 UTC | newest]

Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-10 17:08 [dpdk-dev] [PATCH] install: fix flattening of examples directory Bruce Richardson
2020-11-10 17:09 ` Bruce Richardson
2020-11-10 17:14   ` David Marchand
2020-11-10 17:33 ` [dpdk-dev] [dpdk-stable] " David Marchand
2020-11-10 17:42   ` Bruce Richardson
2020-11-11 15:56 ` [dpdk-dev] [PATCH v2 1/2] examples: fix flattening directory layout on install Bruce Richardson
2020-11-11 15:56   ` [dpdk-dev] [PATCH v2 2/2] examples: skip installing unbuildable examples Bruce Richardson
2020-11-11 17:33     ` Bruce Richardson
2020-11-12  9:14       ` David Marchand
2020-11-12  9:24         ` Bruce Richardson
2020-11-12  9:27           ` David Marchand
2020-11-12  9:35             ` Bruce Richardson
2020-11-11 17:48 ` [dpdk-dev] [PATCH v3 1/4] examples: fix flattening directory layout on install Bruce Richardson
2020-11-11 17:48   ` [dpdk-dev] [PATCH v3 2/4] examples/l2fwd-keepalive: skip build when no librt Bruce Richardson
2020-11-11 17:48   ` [dpdk-dev] [PATCH v3 3/4] examples: stop processing build file if build is impossible Bruce Richardson
2020-11-11 17:48   ` [dpdk-dev] [PATCH v3 4/4] examples: skip installing unbuildable examples Bruce Richardson
2020-11-12  9:41 ` [dpdk-dev] [PATCH v4 0/4] improve examples installation Bruce Richardson
2020-11-12  9:41   ` [dpdk-dev] [PATCH v4 1/4] examples: fix flattening directory layout on install Bruce Richardson
2020-11-12  9:41   ` [dpdk-dev] [PATCH v4 2/4] examples/l2fwd-keepalive: skip build when no librt Bruce Richardson
2020-11-12  9:41   ` [dpdk-dev] [PATCH v4 3/4] examples: stop processing build file if build is impossible Bruce Richardson
2020-11-12  9:41   ` [dpdk-dev] [PATCH v4 4/4] examples: skip installing unbuildable examples Bruce Richardson
2020-11-12 17:06     ` Thomas Monjalon
2020-11-12 11:14   ` [dpdk-dev] [PATCH v4 0/4] improve examples installation David Marchand
2020-11-12 11:38     ` Bruce Richardson
2020-11-12 13:48       ` David Marchand
2020-11-12 14:57         ` Bruce Richardson
2020-11-12 18:36   ` Thomas Monjalon

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).