Skip to content

Commit

Permalink
build: skip driver symlinks without sub-directory
Browse files Browse the repository at this point in the history
if user gives option -Ddrivers_install_subdir= or
-Ddrivers_install_subdir=. to install all the PMDs in
parent directory, The post installation script
"symlink-drivers-solibs.sh" can create invalid library file
named 'librte_*.so*' or meson installation errors:

ln: './librte_*' and './librte_*' are the same file
FAILED: install script '/bin/sh /home/nxa12342/upstream/dpdk/config/.
/buildtools/symlink-drivers-solibs.sh lib/x86_64-linux-gnu .' exit code 1,
stopped
FAILED: meson-install

This patch removes this post-install script execution to symlink
the PMDs libraries when no sub directory is given.

Signed-off-by: Gagandeep Singh <g.singh@nxp.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
  • Loading branch information
Gagandeep Singh authored and tmonjalo committed Nov 11, 2024
1 parent 58ae3be commit dae002f
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions config/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,11 @@ eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
# e.g. ixgbe depends on librte_bus_pci. This means that the bus drivers need
# to be in the library path, so symlink the drivers from the main lib directory.
if not is_windows
meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
get_option('libdir'), pmd_subdir_opt)
# skip symlink-drivers-solibs.sh execution on no sub directory
if pmd_subdir_opt != '' and pmd_subdir_opt != '.'
meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
get_option('libdir'), pmd_subdir_opt)
endif
else
meson.add_install_script(py3,
files('../buildtools/symlink-drivers-solibs.py'),
Expand Down

0 comments on commit dae002f

Please sign in to comment.