diff options
| author |   Damjan Marion <damarion@cisco.com> | 2021-09-30 20:04:14 +0200 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2021-10-05 16:44:32 +0000 |
| commit | 5546e43f7943d6edff6c6587ed4e7233e8002e28 (patch) | |
| tree | 16b4a8ce7a63c4cf1ce7f367b0d0f1d9268f2849 /src/vpp | |
| parent | efd967faff168d037066b6e6824d2a579adbef93 (diff) | |
build: don't hardcode triplet, allow specifying custom lib dir
Type: fix
Change-Id: I33f364fda88914f88f9b976cb83e6d3ff466f0bb
Signed-off-by: Damjan Marion <damarion@cisco.com>
Signed-off-by: Ray Kinsella <mdr@ashroe.eu>
Diffstat (limited to 'src/vpp')
| -rw-r--r-- | src/vpp/conf/startup.conf | 2 | ||||
| -rw-r--r-- | src/vpp/vnet/main.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/vpp/conf/startup.conf b/src/vpp/conf/startup.conf index ee10faa8683..a879db38864 100644 --- a/src/vpp/conf/startup.conf +++ b/src/vpp/conf/startup.conf @@ -201,6 +201,8 @@ cpu { # plugins { ## Adjusting the plugin path depending on where the VPP plugins are # path /ws/vpp/build-root/install-vpp-native/vpp/lib/vpp_plugins + ## Add additional directory to the plugin path + # add-path /tmp/vpp_plugins ## Disable all plugins by default and then selectively enable specific plugins # plugin default { disable } diff --git a/src/vpp/vnet/main.c b/src/vpp/vnet/main.c index e0c7b0dbf58..e9cef5e76a8 100644 --- a/src/vpp/vnet/main.c +++ b/src/vpp/vnet/main.c @@ -60,13 +60,11 @@ vpp_find_plugin_path () return; *p = 0; - s = format (0, "%s/lib/" CLIB_TARGET_TRIPLET "/vpp_plugins:" - "%s/lib/vpp_plugins", path, path); + s = format (0, "%s/" CLIB_LIB_DIR "/vpp_plugins", path, path); vec_add1 (s, 0); vlib_plugin_path = (char *) s; - s = format (0, "%s/lib/" CLIB_TARGET_TRIPLET "/vpp_api_test_plugins:" - "%s/lib/vpp_api_test_plugins", path, path); + s = format (0, "%s/" CLIB_LIB_DIR "/vpp_api_test_plugins", path, path); vec_add1 (s, 0); vat_plugin_path = (char *) s; } |