diff options
| author |   Damjan Marion <damarion@cisco.com> | 2018-09-12 14:01:10 +0200 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2018-09-12 16:38:59 +0000 |
| commit | 79dcbc74cd417f4caf41bc398ccba94cab7d656b (patch) | |
| tree | 043a57b2a904636093ff08b44f97172d09c36114 /src/vpp | |
| parent | 350155329c6075cef48b2d6934329a7ad75cf5c8 (diff) | |
Always use 'lib' instead of 'lib64'
It is packaging responsibility to put libs in the right place.
Use of lib64 resulted in huge amount of files with hardcoded lib64.
This patch simplifies things...
Change-Id: Iab0dea0583e480907732c5d2379eb951a00fa9e6
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/vpp')
| -rw-r--r-- | src/vpp/conf/startup.conf | 4 | ||||
| -rw-r--r-- | src/vpp/vnet/main.c | 6 |
2 files changed, 2 insertions, 8 deletions
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; } |