diff options
24 files changed, 58 insertions, 81 deletions
diff --git a/build-data/packages/vom.mk b/build-data/packages/vom.mk index 84b5bca86dd..e7e02282db4 100644 --- a/build-data/packages/vom.mk +++ b/build-data/packages/vom.mk @@ -25,10 +25,7 @@ vom_cmake_args ?= vom_cmake_args += -DCMAKE_INSTALL_PREFIX:PATH=$(PACKAGE_INSTALL_DIR) vom_cmake_args += -DCMAKE_CXX_FLAGS="$($(TAG)_TAG_CPPFLAGS)" vom_cmake_args += -DCMAKE_SHARED_LINKER_FLAGS="$($(TAG)_TAG_LDFLAGS)" -vom_cmake_args += -DVPP_INCLUDE_DIR_HINT="$(PACKAGE_INSTALL_DIR)/../vpp/include" -vom_cmake_args += -DVPP_LIB_DIR_HINT="$(PACKAGE_INSTALL_DIR)/../vpp/lib64" -vom_cmake_args += -DCMAKE_INCLUDE_PATH="$(call installed_includes_fn, vpp)" -vom_cmake_args += -DCMAKE_LIBRARY_PATH="$(call installed_libs_fn, vpp)" +vom_cmake_args += -DCMAKE_PREFIX_PATH:PATH="$(PACKAGE_INSTALL_DIR)/../vpp" # Use devtoolset on centos 7 ifneq ($(wildcard /opt/rh/devtoolset-7/enable),) diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk index ae26e6dd244..9980c663666 100644 --- a/build-data/packages/vpp.mk +++ b/build-data/packages/vpp.mk @@ -23,8 +23,7 @@ vpp_cmake_args ?= vpp_cmake_args += -DCMAKE_INSTALL_PREFIX:PATH=$(PACKAGE_INSTALL_DIR) vpp_cmake_args += -DCMAKE_C_FLAGS="$($(TAG)_TAG_CFLAGS)" vpp_cmake_args += -DCMAKE_LINKER_FLAGS="$($(TAG)_TAG_LDFLAGS)" -vpp_cmake_args += -DDPDK_INCLUDE_DIR_HINT="$(PACKAGE_INSTALL_DIR)/../dpdk/include" -vpp_cmake_args += -DDPDK_LIB_DIR_HINT="$(PACKAGE_INSTALL_DIR)/../dpdk/lib" +vpp_cmake_args += -DCMAKE_PREFIX_PATH:PATH="$(PACKAGE_INSTALL_DIR)/../dpdk" # Use devtoolset on centos 7 ifneq ($(wildcard /opt/rh/devtoolset-7/enable),) diff --git a/build-root/scripts/find-plugins-contents b/build-root/scripts/find-plugins-contents index 394964ca395..9b39cc88e60 100755 --- a/build-root/scripts/find-plugins-contents +++ b/build-root/scripts/find-plugins-contents @@ -15,11 +15,11 @@ rm -f $2 -for i in ${1}/vpp/lib64/vpp_plugins/*.so; do +for i in ${1}/vpp/lib/vpp_plugins/*.so; do echo ../${i} /usr/lib/vpp_plugins >> ${2} done -for i in ${1}/vpp/lib64/vpp_api_test_plugins/*.so; do +for i in ${1}/vpp/lib/vpp_api_test_plugins/*.so; do echo ../${i} /usr/lib/vpp_api_test_plugins >> ${2} done diff --git a/docs/gettingstarted/developers/gdb_examples.rst b/docs/gettingstarted/developers/gdb_examples.rst index 8a0fb33e2a8..71340dabcd0 100644 --- a/docs/gettingstarted/developers/gdb_examples.rst +++ b/docs/gettingstarted/developers/gdb_examples.rst @@ -18,7 +18,7 @@ Once at the gdb prompt, VPP can be started by running the following commands: Starting program: /scratch/vpp-master/build-root/install-vpp_debug-native/vpp/bin/vpp -c /etc/vpp/startup.conf [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". - vlib_plugin_early_init:361: plugin path /scratch/vpp-master/build-root/install-vpp_debug-native/vpp/lib/vpp_plugins:/scratch/vpp-master/build-root/install-vpp_debug-native/vpp/lib64/vpp_plugins + vlib_plugin_early_init:361: plugin path /scratch/vpp-master/build-root/install-vpp_debug-native/vpp/lib/vpp_plugins:/scratch/vpp-master/build-root/install-vpp_debug-native/vpp/lib/vpp_plugins .... Backtrace diff --git a/docs/gettingstarted/progressivevpp/runningvpp.rst b/docs/gettingstarted/progressivevpp/runningvpp.rst index ff20064b5eb..19d2f4e9ede 100644 --- a/docs/gettingstarted/progressivevpp/runningvpp.rst +++ b/docs/gettingstarted/progressivevpp/runningvpp.rst @@ -20,7 +20,7 @@ Using the files we created in setup we will start VPP. .. code-block:: console $ sudo /usr/bin/vpp -c startup1.conf - vlib_plugin_early_init:361: plugin path /usr/lib/vpp_plugins:/usr/lib64/vpp_plugins + vlib_plugin_early_init:361: plugin path /usr/lib/vpp_plugins:/usr/lib/vpp_plugins load_one_plugin:189: Loaded plugin: abf_plugin.so (ACL based Forwarding) load_one_plugin:189: Loaded plugin: acl_plugin.so (Access Control Lists) load_one_plugin:189: Loaded plugin: avf_plugin.so (Intel Adaptive Virtual Function (AVF) Device Plugin) diff --git a/docs/gettingstarted/users/configuring/startup.rst b/docs/gettingstarted/users/configuring/startup.rst index 0bc6ca4ae8a..77f12b24e3e 100644 --- a/docs/gettingstarted/users/configuring/startup.rst +++ b/docs/gettingstarted/users/configuring/startup.rst @@ -1225,7 +1225,7 @@ only the plugins that are desired. * **path <path>** Adjust the plugin path depending on where the VPP plugins are installed. - **Example:** path /home/bms/vpp/build-root/install-vpp-native/vpp/lib64/vpp_plugins + **Example:** path /home/bms/vpp/build-root/install-vpp-native/vpp/lib/vpp_plugins * **name-filter <filter-name>** TBD @@ -1277,7 +1277,7 @@ Alternate syntax to choose plugin path. Plugin_path configuration controls the set of directories searched for vlib plugins. Supply a colon-separated list of (absolute) directory names: plugin_path dir1:dir2:...:dirN - **Example:** plugin_path /home/bms/vpp/build-root/install-vpp-native/vpp/lib64/vpp_plugins + **Example:** plugin_path /home/bms/vpp/build-root/install-vpp-native/vpp/lib/vpp_plugins .. _punt: diff --git a/extras/rpm/vpp-suse.spec b/extras/rpm/vpp-suse.spec index 22420fa154c..2830bd3e162 100644 --- a/extras/rpm/vpp-suse.spec +++ b/extras/rpm/vpp-suse.spec @@ -18,7 +18,7 @@ %define _vpp_build_dir %{buildroot}/../../BUILD/vpp-%{version}/build-root %define _vpp_install_dir %{_vpp_build_dir}/install-vpp-native/ -%define _vpp_plugins_lib_dir %{_vpp_install_dir}/vpp/lib64 +%define _vpp_plugins_lib_dir %{_vpp_install_dir}/vpp/lib %define lname libvpp0 diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec index fd708f206bd..13397513a2b 100644 --- a/extras/rpm/vpp.spec +++ b/extras/rpm/vpp.spec @@ -282,18 +282,18 @@ mkdir -p -m755 %{buildroot}%{_localstatedir}/log/vpp # # vpp-plugins -# +# mkdir -p -m755 %{buildroot}/usr/lib/vpp_plugins mkdir -p -m755 %{buildroot}/usr/lib/vpp_api_test_plugins -for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_plugins && find -type f -print) +for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib/vpp_plugins && find -type f -print) do - install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_plugins/$file \ + install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib/vpp_plugins/$file \ %{buildroot}/usr/lib/vpp_plugins/$file done -for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_api_test_plugins && find -type f -print) +for file in $(cd %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib/vpp_api_test_plugins && find -type f -print) do - install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib64/vpp_api_test_plugins/$file \ + install -p -m 644 %{_mu_build_dir}/%{_vpp_install_dir}/vpp/lib/vpp_api_test_plugins/$file \ %{buildroot}/usr/lib/vpp_api_test_plugins/$file done diff --git a/extras/vcl-ldpreload/README.md b/extras/vcl-ldpreload/README.md index b40c4c5ad07..c07b4184be8 100644 --- a/extras/vcl-ldpreload/README.md +++ b/extras/vcl-ldpreload/README.md @@ -4,7 +4,7 @@ User can LD_PRELOAD any application that uses POSIX socket API. NOTE: The sources have been moved to .../vpp/src/vcl and libvcl_ldpreload.so libvcl-ldpreload.so is built with VPP and can be found in - .../vpp/build-root/install-vpp[_debug]-native/vpp/lib64 + .../vpp/build-root/install-vpp[_debug]-native/vpp/lib ## HowTo diff --git a/extras/vcl-ldpreload/test/common/nginx_test.sh b/extras/vcl-ldpreload/test/common/nginx_test.sh index ea771038658..73f2911b57c 100755 --- a/extras/vcl-ldpreload/test/common/nginx_test.sh +++ b/extras/vcl-ldpreload/test/common/nginx_test.sh @@ -33,7 +33,7 @@ fi if [ -z "$VCL_LDPRELOAD_LIB_DIR" ] ; then echo "ERROR: VCL_LDPRELOAD_LIB_DIR environment variable not set!" >&2 echo " Please set VCL_LDPRELOAD_LIB_DIR to " >&2 - echo " $WS_ROOT/build-root/install-vpp[_debug]-native/vpp/lib64." >&2 + echo " $WS_ROOT/build-root/install-vpp[_debug]-native/vpp/lib." >&2 exit 1 fi @@ -76,7 +76,7 @@ else echo "docker run --rm --name $vpp_dk_name -v $LDP_TEST_DIR/common/nginx_welcome.html:/usr/share/nginx/html/index.html:ro -d nginx" docker run --rm --name $vpp_dk_name -v $LDP_TEST_DIR/common/nginx_welcome.html:/usr/share/nginx/html/index.html:ro -d nginx - export LD_LIBRARY_PATH="$WS_ROOT/build-root/install-vpp${debug}-native/vpp/lib64/:$LDP_DIR/src/.libs:" + export LD_LIBRARY_PATH="$WS_ROOT/build-root/install-vpp${debug}-native/vpp/lib/:$LDP_DIR/src/.libs:" # Extract nginx IPv4 address from docker bridge # diff --git a/extras/vcl-ldpreload/test/curl_test.sh b/extras/vcl-ldpreload/test/curl_test.sh index 24b0c6e06d1..5c8d2f4a9d4 100755 --- a/extras/vcl-ldpreload/test/curl_test.sh +++ b/extras/vcl-ldpreload/test/curl_test.sh @@ -16,7 +16,7 @@ fi LDP_DIR="${WS_ROOT}/extras/vcl-ldpreload" LDP_TEST_DIR="${LDP_TEST_DIR:-${LDP_DIR}/test}" -VCL_LDPRELOAD_LIB_DIR="${VCL_LDPRELOAD_LIB_DIR:-${WS_ROOT}/build-root/install-vpp_debug-native/vpp/lib64}" +VCL_LDPRELOAD_LIB_DIR="${VCL_LDPRELOAD_LIB_DIR:-${WS_ROOT}/build-root/install-vpp_debug-native/vpp/lib}" TEST_APP="${TEST_APP:-curl}" source $LDP_TEST_DIR/common/nginx_test.sh diff --git a/extras/vcl-ldpreload/test/wget_test.sh b/extras/vcl-ldpreload/test/wget_test.sh index a2663d71158..78b34f9e481 100755 --- a/extras/vcl-ldpreload/test/wget_test.sh +++ b/extras/vcl-ldpreload/test/wget_test.sh @@ -16,7 +16,7 @@ fi LDP_DIR="${WS_ROOT}/extras/vcl-ldpreload" LDP_TEST_DIR="${LDP_TEST_DIR:-${LDP_DIR}/test}" -VCL_LDPRELOAD_LIB_DIR="${VCL_LDPRELOAD_LIB_DIR:-$WS_ROOT/build-root/install-vpp_debug-native/vpp/lib64}" +VCL_LDPRELOAD_LIB_DIR="${VCL_LDPRELOAD_LIB_DIR:-$WS_ROOT/build-root/install-vpp_debug-native/vpp/lib}" TEST_APP="${TEST_APP:-wget}" source $LDP_TEST_DIR/common/nginx_test.sh diff --git a/extras/vom/CMakeLists.txt b/extras/vom/CMakeLists.txt index d3557104fd8..e84e2a91850 100644 --- a/extras/vom/CMakeLists.txt +++ b/extras/vom/CMakeLists.txt @@ -18,16 +18,8 @@ project(vom) include(CheckCCompilerFlag) include(CheckCXXCompilerFlag) -if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*") - set(VOM_LIB_DIR_NAME lib64) -elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)") - set(VOM_LIB_DIR_NAME lib64) -else() - set(VOM_LIB_DIR_NAME lib) -endif() - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) -set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${VOM_LIB_DIR_NAME}) +set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) set(CMAKE_INSTALL_MESSAGE NEVER) find_package(Threads REQUIRED) diff --git a/extras/vom/vom/CMakeLists.txt b/extras/vom/vom/CMakeLists.txt index c9ff7aa41ee..76abd4604c5 100644 --- a/extras/vom/vom/CMakeLists.txt +++ b/extras/vom/vom/CMakeLists.txt @@ -19,8 +19,8 @@ unset (GBP_FILE) unset (VOM_SOURCES) unset (VOM_HEADERS) -find_library(VAPICLIENT_LIB NAMES vapiclient REQUIRED HINTS ${VPP_LIB_DIR_HINT}) -find_path(VAPICLIENT_INCLUDE_DIR NAMES vapi/vapi.hpp HINTS ${VPP_INCLUDE_DIR_HINT}) +find_library(VAPICLIENT_LIB NAMES vapiclient REQUIRED) +find_path(VAPICLIENT_INCLUDE_DIR NAMES vapi/vapi.hpp) if(NOT VAPICLIENT_INCLUDE_DIR OR NOT VAPICLIENT_LIB) message(FATAL_ERROR "Cannot find vapiclient library and/or headers") @@ -29,10 +29,10 @@ endif() include_directories(${VAPICLIENT_INCLUDE_DIR}) include_directories(${CMAKE_SOURCE_DIR}) -find_file(ACL_FILE NAMES acl.api.vapi.hpp PATH_SUFFIXES vapi HINTS ${VPP_INCLUDE_DIR_HINT}) -find_file(NAT_FILE NAMES nat.api.vapi.hpp PATH_SUFFIXES vapi HINTS ${VPP_INCLUDE_DIR_HINT}) -find_file(L2E_FILE NAMES l2e.api.vapi.hpp PATH_SUFFIXES vapi HINTS ${VPP_INCLUDE_DIR_HINT}) -find_file(GBP_FILE NAMES gbp.api.vapi.hpp PATH_SUFFIXES vapi HINTS ${VPP_INCLUDE_DIR_HINT}) +find_file(ACL_FILE NAMES acl.api.vapi.hpp PATH_SUFFIXES vapi) +find_file(NAT_FILE NAMES nat.api.vapi.hpp PATH_SUFFIXES vapi) +find_file(L2E_FILE NAMES l2e.api.vapi.hpp PATH_SUFFIXES vapi) +find_file(GBP_FILE NAMES gbp.api.vapi.hpp PATH_SUFFIXES vapi) if(ACL_FILE) list(APPEND VOM_SOURCES @@ -232,7 +232,7 @@ add_library(vom SHARED ${VOM_SOURCES}) target_link_libraries(vom ${VAPICLIENT_LIB} Threads::Threads boost_thread ${BOOST_SYSTEM_LIB} ${BOOST_FILESYSTEM_LIB} ${BOOST_ASIO_LIB} m rt) add_definitions(-Wall -Werror -std=gnu++11) -install(TARGETS vom DESTINATION ${VOM_LIB_DIR_NAME}) +install(TARGETS vom DESTINATION lib) foreach(file ${VOM_HEADERS}) install(FILES ${file} DESTINATION include/vom) diff --git a/extras/vpp_config/data/startup.conf.template b/extras/vpp_config/data/startup.conf.template index 19a8454a177..22b0e128d48 100644 --- a/extras/vpp_config/data/startup.conf.template +++ b/extras/vpp_config/data/startup.conf.template @@ -114,10 +114,10 @@ dpdk {{ # Adjusting the plugin path depending on where the VPP plugins are: #plugins #{{ -# path /home/bms/vpp/build-root/install-vpp-native/vpp/lib64/vpp_plugins +# path /home/bms/vpp/build-root/install-vpp-native/vpp/lib/vpp_plugins #}} # Alternate syntax to choose plugin path -#plugin_path /home/bms/vpp/build-root/install-vpp-native/vpp/lib64/vpp_plugins +#plugin_path /home/bms/vpp/build-root/install-vpp-native/vpp/lib/vpp_plugins {tcp} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 53cb185f1ae..420725a5f22 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -49,7 +49,7 @@ endif() ############################################################################## # install config ############################################################################## -set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${VPP_LIB_DIR_NAME}") +set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") set(CMAKE_INSTALL_MESSAGE NEVER) include_directories ( diff --git a/src/cmake/cpu.cmake b/src/cmake/cpu.cmake index 8ea050b4d23..bdc9014d944 100644 --- a/src/cmake/cpu.cmake +++ b/src/cmake/cpu.cmake @@ -55,7 +55,6 @@ set(VPP_LOG2_CACHE_LINE_SIZE ${VPP_LOG2_CACHE_LINE_SIZE} ############################################################################## if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*") set(CMAKE_C_FLAGS "-march=corei7 -mtune=corei7-avx ${CMAKE_C_FLAGS}") - set(VPP_LIB_DIR_NAME lib64) check_c_compiler_flag("-march=core-avx2" compiler_flag_march_core_avx2) if(compiler_flag_march_core_avx2) list(APPEND MARCH_VARIANTS "avx2\;-march=core-avx2 -mtune=core-avx2") @@ -66,9 +65,6 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*") endif() elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)") set(CMAKE_C_FLAGS "-march=armv8-a+crc ${CMAKE_C_FLAGS}") - set(VPP_LIB_DIR_NAME lib64) -else() - set(VPP_LIB_DIR_NAME lib) endif() macro(vpp_library_set_multiarch_sources lib) diff --git a/src/cmake/library.cmake b/src/cmake/library.cmake index 04165ffb1e4..e0eb7af76fc 100644 --- a/src/cmake/library.cmake +++ b/src/cmake/library.cmake @@ -33,7 +33,7 @@ macro(add_vpp_library lib) endif() install( TARGETS ${lib} - DESTINATION ${VPP_LIB_DIR_NAME} + DESTINATION lib COMPONENT ${ARG_COMPONENT} ) diff --git a/src/cmake/plugin.cmake b/src/cmake/plugin.cmake index c6f551dd3d5..39c940daed4 100644 --- a/src/cmake/plugin.cmake +++ b/src/cmake/plugin.cmake @@ -69,13 +69,13 @@ macro(add_vpp_plugin name) LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/vpp_api_test_plugins) install( TARGETS ${test_plugin_name} - DESTINATION ${VPP_LIB_DIR_NAME}/vpp_api_test_plugins + DESTINATION lib/vpp_api_test_plugins COMPONENT ${PLUGIN_COMPONENT} ) endif() install( TARGETS ${plugin_name} - DESTINATION ${VPP_LIB_DIR_NAME}/vpp_plugins + DESTINATION lib/vpp_plugins COMPONENT ${PLUGIN_COMPONENT} ) endmacro() diff --git a/src/plugins/dpdk/CMakeLists.txt b/src/plugins/dpdk/CMakeLists.txt index 09ebd11dd8b..3199c3e43f0 100644 --- a/src/plugins/dpdk/CMakeLists.txt +++ b/src/plugins/dpdk/CMakeLists.txt @@ -14,9 +14,8 @@ ############################################################################## # Find lib and include files ############################################################################## -find_path(DPDK_INCLUDE_DIR PATH_SUFFIXES dpdk NAMES rte_config.h HINTS - ${DPDK_INCLUDE_DIR_HINT}) -find_library(DPDK_LIB NAMES libdpdk.a HINTS ${DPDK_LIB_DIR_HINT}) +find_path(DPDK_INCLUDE_DIR PATH_SUFFIXES dpdk NAMES rte_config.h) +find_library(DPDK_LIB NAMES libdpdk.a) ############################################################################## # Find DPDK Version diff --git a/src/vpp/conf/startup.conf b/src/vpp/conf/startup.conf index 34631aa8e0f..979d41ab4c3 100644 --- a/src/vpp/conf/startup.conf +++ b/src/vpp/conf/startup.conf @@ -135,7 +135,7 @@ cpu { # plugins { ## Adjusting the plugin path depending on where the VPP plugins are - # path /home/bms/vpp/build-root/install-vpp-native/vpp/lib64/vpp_plugins + # path /home/bms/vpp/build-root/install-vpp-native/vpp/lib/vpp_plugins ## Disable all plugins by default and then selectively enable specific plugins # plugin default { disable } @@ -148,4 +148,4 @@ cpu { # } ## Alternate syntax to choose plugin path - # plugin_path /home/bms/vpp/build-root/install-vpp-native/vpp/lib64/vpp_plugins + # plugin_path /home/bms/vpp/build-root/install-vpp-native/vpp/lib/vpp_plugins diff --git a/src/vpp/vnet/main.c b/src/vpp/vnet/main.c index afe18c8fb40..db28662de4c 100644 --- a/src/vpp/vnet/main.c +++ b/src/vpp/vnet/main.c @@ -58,16 +58,10 @@ vpp_find_plugin_path () *p = 0; s = format (0, "%s/lib/vpp_plugins", path); -#if uword_bits == 64 - s = format (s, ":%s/lib64/vpp_plugins", path); -#endif vec_add1 (s, 0); vlib_plugin_path = (char *) s; s = format (0, "%s/lib/vpp_api_test_plugins", path); -#if uword_bits == 64 - s = format (s, ":%s/lib64/vpp_api_test_plugins", path); -#endif vec_add1 (s, 0); vat_plugin_path = (char *) s; } diff --git a/test/ext/Makefile b/test/ext/Makefile index a66a72c35dc..4ae56cfc3eb 100644 --- a/test/ext/Makefile +++ b/test/ext/Makefile @@ -9,7 +9,7 @@ VAPI_CPPBIN= endif VAPI_LIBS = \ - -L$(VPP_TEST_INSTALL_PATH)/vpp/lib64 \ + -L$(VPP_TEST_INSTALL_PATH)/vpp/lib \ -lvppinfra -lvlibmemoryclient -lsvm -lpthread -lcheck -lrt -lm -lvapiclient ifneq ($(filter centos opensuse opensuse-tumbleweed opensuse-leap,$(OS_ID)),$(OS_ID)) @@ -55,7 +55,7 @@ $(VOM_BINDIR): LIB_VOM = -lvom VOM_LIBS = \ - -L$(VPP_TEST_INSTALL_PATH)/vom/lib64 \ + -L$(VPP_TEST_INSTALL_PATH)/vom/lib \ -lvom \ -lboost_thread \ -lboost_system \ @@ -69,7 +69,7 @@ VOM_CPPFLAGS = \ $(CPPFLAGS) $(VOM_BIN): $(VOM_CPPSRC) $(VOM_BINDIR) - $(CXX) -o $@ $(VOM_CPPFLAGS) -O0 -g $(VOM_CPPSRC) $(VOM_LIBS) -Wl,-rpath,$(VPP_TEST_INSTALL_PATH)/vom/lib64 + $(CXX) -o $@ $(VOM_CPPFLAGS) -O0 -g $(VOM_CPPSRC) $(VOM_LIBS) -Wl,-rpath,$(VPP_TEST_INSTALL_PATH)/vom/lib $(VOM_BIN).d: $(VOM_CPPSRC) $(VOM_BINDIR) $(CXX) -o $@ $(VOM_CPPFLAGS) -MM -MT '$(VOM_BIN)' $(VOM_CPPSRC) > $@ diff --git a/test/scripts/socket_test.sh b/test/scripts/socket_test.sh index 5fd8b5f9db6..1528116bf80 100755 --- a/test/scripts/socket_test.sh +++ b/test/scripts/socket_test.sh @@ -7,12 +7,12 @@ vpp_dir="$WS_ROOT/build-root/install-vpp-native/vpp/bin/" vpp_debug_dir="$WS_ROOT/build-root/install-vpp_debug-native/vpp/bin/" vpp_shm_dir="/dev/shm/" vpp_run_dir="/run/vpp" -lib64_dir="$WS_ROOT/build-root/install-vpp-native/vpp/lib64/" -lib64_debug_dir="$WS_ROOT/build-root/install-vpp_debug-native/vpp/lib64/" +lib_dir="$WS_ROOT/build-root/install-vpp-native/vpp/lib/" +lib_debug_dir="$WS_ROOT/build-root/install-vpp_debug-native/vpp/lib/" dpdk_devbind="/usr/share/dpdk/usertools/dpdk-devbind.py" docker_vpp_dir="/vpp/" docker_app_dir="/vpp/" -docker_lib64_dir="/vpp-lib64/" +docker_lib_dir="/vpp-lib/" docker_os="ubuntu" vcl_ldpreload_lib="libvcl_ldpreload.so.0.0.0" user_gid="$(id -g)" @@ -144,7 +144,7 @@ while getopts ":hitlbcd6fn:m:e:g:p:E:I:N:P:R:S:T:UBVXD" opt; do ;; d) title_dbg="-DEBUG" vpp_dir=$vpp_debug_dir - lib64_dir=$lib64_debug_dir + lib_dir=$lib_debug_dir ;; e) if [ $OPTARG = "a" ] || [ $OPTARG = "all" ] ; then emacs_client=1 @@ -162,7 +162,7 @@ while getopts ":hitlbcd6fn:m:e:g:p:E:I:N:P:R:S:T:UBVXD" opt; do fi title_dbg="-DEBUG" vpp_dir=$vpp_debug_dir - lib64_dir=$lib64_debug_dir + lib_dir=$lib_debug_dir ;; n) vpp_eth_name="$OPTARG" ;; @@ -262,7 +262,7 @@ if [ -z "$VCL_DEBUG" ] ; then fi fi -VCL_LDPRELOAD_LIB_DIR="${VCL_LDPRELOAD_LIB_DIR:-$lib64_dir}" +VCL_LDPRELOAD_LIB_DIR="${VCL_LDPRELOAD_LIB_DIR:-$lib_dir}" if [ -z "$WS_ROOT" ] ; then echo "ERROR: WS_ROOT environment variable not set!" >&2 @@ -282,9 +282,9 @@ if [ ! -d $vpp_dir ] ; then fi if [[ $run_test =~ .*"_preload" ]] ; then - if [ ! -d $lib64_dir ] ; then - echo "ERROR: Missing VPP$title_dbg lib64 directory!" >&2 - echo " $lib64_dir" >&2 + if [ ! -d $lib_dir ] ; then + echo "ERROR: Missing VPP$title_dbg lib directory!" >&2 + echo " $lib_dir" >&2 elif [ ! -d $VCL_LDPRELOAD_LIB_DIR ] ; then echo "ERROR: Missing VCL LD_PRELOAD Library directory!" >&2 echo " $VCL_LDPRELOAD_LIB_DIR" >&2 @@ -499,7 +499,7 @@ EOF echo "ERROR: No inet6 address configured for $vpp_eth_name!" usage fi - vpp_args="$vpp_args plugins { path ${lib64_dir}vpp_plugins } dpdk { dev $vpp_eth_pci_id }" + vpp_args="$vpp_args plugins { path ${lib_dir}vpp_plugins } dpdk { dev $vpp_eth_pci_id }" sudo ifconfig $vpp_eth_name down 2> /dev/null echo "Configuring VPP to use $vpp_eth_name ($vpp_eth_pci_id), inet addr $vpp_eth_ip4_addr" @@ -724,7 +724,7 @@ native_preload() { namespace_secret="$server_namespace_secret" fi write_script_header $cmd2_file $tmp_gdb_cmdfile "$title2" "sleep 3" - echo "export LD_LIBRARY_PATH=\"$lib64_dir:$VCL_LDPRELOAD_LIB_DIR:$LD_LIBRARY_PATH\"" >> $cmd2_file + echo "export LD_LIBRARY_PATH=\"$lib_dir:$VCL_LDPRELOAD_LIB_DIR:$LD_LIBRARY_PATH\"" >> $cmd2_file echo "${pre_cmd}${app_dir}${srvr_app}" >> $cmd2_file write_script_footer $cmd2_file $perf_server chmod +x $cmd2_file @@ -740,7 +740,7 @@ native_preload() { namespace_secret="$client_namespace_secret" fi write_script_header $cmd3_file $tmp_gdb_cmdfile "$title3" "sleep 4" - echo "export LD_LIBRARY_PATH=\"$lib64_dir:$VCL_LDPRELOAD_LIB_DIR:$LD_LIBRARY_PATH\"" >> $cmd3_file + echo "export LD_LIBRARY_PATH=\"$lib_dir:$VCL_LDPRELOAD_LIB_DIR:$LD_LIBRARY_PATH\"" >> $cmd3_file echo "srvr_addr=\"$sock_srvr_addr\"" >> $cmd3_file echo "${pre_cmd}${app_dir}${clnt_app}" >> $cmd3_file write_script_footer $cmd3_file $perf_client @@ -779,7 +779,7 @@ native_vcl() { namespace_secret="$server_namespace_secret" fi write_script_header $cmd2_file $tmp_gdb_cmdfile "$title2" "$delay" - echo "export LD_LIBRARY_PATH=\"$lib64_dir:$LD_LIBRARY_PATH\"" >> $cmd2_file + echo "export LD_LIBRARY_PATH=\"$lib_dir:$LD_LIBRARY_PATH\"" >> $cmd2_file echo "${pre_cmd}${app_dir}${srvr_app}" >> $cmd2_file write_script_footer $cmd2_file $perf_server chmod +x $cmd2_file @@ -800,7 +800,7 @@ native_vcl() { namespace_secret="$client_namespace_secret" fi write_script_header $cmd3_file $tmp_gdb_cmdfile "$title3" "$delay" - echo "export LD_LIBRARY_PATH=\"$lib64_dir:$LD_LIBRARY_PATH\"" >> $cmd3_file + echo "export LD_LIBRARY_PATH=\"$lib_dir:$LD_LIBRARY_PATH\"" >> $cmd3_file echo "srvr_addr=\"$sock_srvr_addr\"" >> $cmd3_file echo "${pre_cmd}${app_dir}${clnt_app}" >> $cmd3_file write_script_footer $cmd3_file $perf_client @@ -867,7 +867,7 @@ docker_preload() { namespace_secret="$server_namespace_secret" fi write_script_header $cmd2_file $tmp_gdb_cmdfile "$title2" "sleep 2" - echo "docker run -it -v $vpp_shm_dir:$vpp_shm_dir -v $vpp_dir:$docker_vpp_dir -v $lib64_dir:$docker_lib64_dir -v $ld_preload_dir:$docker_ld_preload_dir -v $vcl_config_dir:$docker_vcl_config_dir -p $sock_srvr_port:$sock_srvr_port -e VCL_DEBUG=$VCL_DEBUG -e VCL_CONFIG=${docker_vcl_config_dir}$vcl_config -e LD_LIBRARY_PATH=$docker_lib64_dir:$docker_ld_preload_dir ${docker_ld_preload}$docker_os ${docker_app_dir}${srvr_app}" >> $cmd2_file + echo "docker run -it -v $vpp_shm_dir:$vpp_shm_dir -v $vpp_dir:$docker_vpp_dir -v $lib_dir:$docker_lib_dir -v $ld_preload_dir:$docker_ld_preload_dir -v $vcl_config_dir:$docker_vcl_config_dir -p $sock_srvr_port:$sock_srvr_port -e VCL_DEBUG=$VCL_DEBUG -e VCL_CONFIG=${docker_vcl_config_dir}$vcl_config -e LD_LIBRARY_PATH=$docker_lib_dir:$docker_ld_preload_dir ${docker_ld_preload}$docker_os ${docker_app_dir}${srvr_app}" >> $cmd2_file write_script_footer $cmd2_file $perf_server chmod +x $cmd2_file fi @@ -883,7 +883,7 @@ docker_preload() { fi write_script_header $cmd3_file $tmp_gdb_cmdfile "$title3" "sleep 4" echo "$get_docker_server_ip4addr" >> $cmd3_file - echo "docker run -it --cpuset-cpus='4-7' -v $vpp_shm_dir:$vpp_shm_dir -v $vpp_dir:$docker_vpp_dir -v $lib64_dir:$docker_lib64_dir -v $ld_preload_dir:$docker_ld_preload_dir -v $vcl_config_dir:$docker_vcl_config_dir -e VCL_DEBUG=$VCL_DEBUG -e VCL_CONFIG=${docker_vcl_config_dir}$vcl_config -e LD_LIBRARY_PATH=$docker_lib64_dir ${docker_ld_preload}$docker_os ${docker_app_dir}${clnt_app}" >> $cmd3_file + echo "docker run -it --cpuset-cpus='4-7' -v $vpp_shm_dir:$vpp_shm_dir -v $vpp_dir:$docker_vpp_dir -v $lib_dir:$docker_lib_dir -v $ld_preload_dir:$docker_ld_preload_dir -v $vcl_config_dir:$docker_vcl_config_dir -e VCL_DEBUG=$VCL_DEBUG -e VCL_CONFIG=${docker_vcl_config_dir}$vcl_config -e LD_LIBRARY_PATH=$docker_lib_dir ${docker_ld_preload}$docker_os ${docker_app_dir}${clnt_app}" >> $cmd3_file write_script_footer $cmd3_file $perf_client chmod +x $cmd3_file fi @@ -916,7 +916,7 @@ docker_vcl() { namespace_secret="$server_namespace_secret" fi write_script_header $cmd2_file $tmp_gdb_cmdfile "$title2" "sleep 2" - echo "docker run -it --cpuset-cpus='4-7' -v $vpp_shm_dir:$vpp_shm_dir -v $vpp_dir:$docker_vpp_dir -v $lib64_dir:$docker_lib64_dir -v $vcl_config_dir:$docker_vcl_config_dir -p $sock_srvr_port:$sock_srvr_port -e VCL_CONFIG=${docker_vcl_config_dir}/$vcl_config -e LD_LIBRARY_PATH=$docker_lib64_dir $docker_os ${docker_app_dir}${srvr_app}" >> $cmd2_file + echo "docker run -it --cpuset-cpus='4-7' -v $vpp_shm_dir:$vpp_shm_dir -v $vpp_dir:$docker_vpp_dir -v $lib_dir:$docker_lib_dir -v $vcl_config_dir:$docker_vcl_config_dir -p $sock_srvr_port:$sock_srvr_port -e VCL_CONFIG=${docker_vcl_config_dir}/$vcl_config -e LD_LIBRARY_PATH=$docker_lib_dir $docker_os ${docker_app_dir}${srvr_app}" >> $cmd2_file write_script_footer $cmd2_file $perf_server chmod +x $cmd2_file fi @@ -932,7 +932,7 @@ docker_vcl() { fi write_script_header $cmd3_file $tmp_gdb_cmdfile "$title3" "sleep 3" echo "$get_docker_server_ip4addr" >> $cmd3_file - echo "docker run -it --cpuset-cpus='4-7' -v $vpp_shm_dir:$vpp_shm_dir -v $vpp_dir:$docker_vpp_dir -v $lib64_dir:$docker_lib64_dir -v $vcl_config_dir:$docker_vcl_config_dir -e VCL_CONFIG=${docker_vcl_config_dir}/$vcl_config -e LD_LIBRARY_PATH=$docker_lib64_dir $docker_os ${docker_app_dir}${clnt_app}" >> $cmd3_file + echo "docker run -it --cpuset-cpus='4-7' -v $vpp_shm_dir:$vpp_shm_dir -v $vpp_dir:$docker_vpp_dir -v $lib_dir:$docker_lib_dir -v $vcl_config_dir:$docker_vcl_config_dir -e VCL_CONFIG=${docker_vcl_config_dir}/$vcl_config -e LD_LIBRARY_PATH=$docker_lib_dir $docker_os ${docker_app_dir}${clnt_app}" >> $cmd3_file write_script_footer $cmd3_file $perf_client chmod +x $cmd3_file fi |