diff options
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/rpm/vpp-suse.spec | 2 | ||||
| -rw-r--r-- | extras/rpm/vpp.spec | 10 | ||||
| -rw-r--r-- | extras/vcl-ldpreload/README.md | 2 | ||||
| -rwxr-xr-x | extras/vcl-ldpreload/test/common/nginx_test.sh | 4 | ||||
| -rwxr-xr-x | extras/vcl-ldpreload/test/curl_test.sh | 2 | ||||
| -rwxr-xr-x | extras/vcl-ldpreload/test/wget_test.sh | 2 | ||||
| -rw-r--r-- | extras/vom/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | extras/vom/vom/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | extras/vpp_config/data/startup.conf.template | 4 |
9 files changed, 21 insertions, 29 deletions
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} |