From: Bruce Richardson Date: Fri, 12 Mar 2021 14:56:05 +0000 (+0000) Subject: build: exclude meson files from examples installation X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=5d20515e0c260377fcd23fab785070c4391cc59d;p=dpdk.git build: exclude meson files from examples installation 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") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson --- diff --git a/examples/meson.build b/examples/meson.build index b9ab24223f..3fe08d4ca5 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -48,6 +48,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 fcc4d4c900..7778e18200 100644 --- a/meson.build +++ b/meson.build @@ -61,7 +61,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')