d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: exclude meson files from examples installation

Browse Source 
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: e5b95003f1 ("examples: fix flattening directory layout on install")
Cc: stable@dpdk.org

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
This commit is contained in:
Bruce Richardson 2021-03-12 14:56:05 +00:00 committed by Thomas Monjalon
parent df58e45e4d
commit 5d20515e0c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/meson.build
View File

@ -48,6 +48,12 @@ all_examples = [
'vmdq', 'vmdq_dcb', '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') == '' if get_option('examples') == ''
subdir_done() subdir_done()
endif endif

2
meson.build
View File

@ -61,7 +61,7 @@ subdir('doc')
subdir('examples') subdir('examples')
install_subdir('examples', install_subdir('examples',
install_dir: get_option('datadir') + '/dpdk', install_dir: get_option('datadir') + '/dpdk',
exclude_files: 'meson.build') exclude_files: ex_file_excludes)
# build kernel modules if enabled # build kernel modules if enabled
if get_option('enable_kmods') if get_option('enable_kmods')