diff options
| -rw-r--r-- | build-data/platforms.mk | 5 | ||||
| -rw-r--r-- | build-data/platforms/vpp.mk | 2 | ||||
| -rw-r--r-- | build-root/deb/debian/control | 7 | ||||
| -rwxr-xr-x | build-root/scripts/find-plugins-contents | 11 |
4 files changed, 24 insertions, 1 deletions
diff --git a/build-data/platforms.mk b/build-data/platforms.mk index 625006b474f..65809ea6eb3 100644 --- a/build-data/platforms.mk +++ b/build-data/platforms.mk @@ -31,6 +31,7 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES)) : need symbolic links in the lib pkg ; \ find $(INSTALL_PREFIX)$(ARCH)/*/lib* \( -type f -o -type l \) \ -print | egrep -e '*\.so\.*\.*\.*' \ + | grep -v plugins\/ \ | sed -e 's:.*:../& /usr/lib/x86_64-linux-gnu:' \ > deb/debian/vpp-lib.install ; \ \ @@ -38,6 +39,10 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES)) ./scripts/find-dev-contents $(INSTALL_PREFIX)$(ARCH) \ deb/debian/vpp-dev.install ; \ \ + : plugins package ; \ + ./scripts/find-plugins-contents $(INSTALL_PREFIX)$(ARCH) \ + deb/debian/vpp-plugins.install ; \ + \ : dpdk headers ; \ ./scripts/find-dpdk-contents $(INSTALL_PREFIX)$(ARCH) \ deb/debian/vpp-dpdk-dev.install ; \ diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk index fb1867c750f..977c4c3266f 100644 --- a/build-data/platforms/vpp.mk +++ b/build-data/platforms/vpp.mk @@ -30,7 +30,7 @@ vpp_uses_dpdk = yes # vpp_enable_tests = yes vpp_root_packages = vpp vlib vlib-api vnet svm vpp-api-test \ - vpp-api gmod + vpp-api gmod plugins vpp_configure_args_vpp = --with-dpdk vnet_configure_args_vpp = --with-dpdk diff --git a/build-root/deb/debian/control b/build-root/deb/debian/control index 97464e42680..d1e7680eabd 100644 --- a/build-root/deb/debian/control +++ b/build-root/deb/debian/control @@ -47,6 +47,13 @@ Description: Vector Packet Processing--runtime libraries vlib-api - binary API library vnet - network stack library +Package: vpp-plugins +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Vector Packet Processing--runtime plugins + This package contains VPP plugins + . + Package: vpp-dpdk-dkms Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} diff --git a/build-root/scripts/find-plugins-contents b/build-root/scripts/find-plugins-contents new file mode 100755 index 00000000000..8d1a4d5ae29 --- /dev/null +++ b/build-root/scripts/find-plugins-contents @@ -0,0 +1,11 @@ +#!/bin/bash + +rm -f $2 + +for i in ${1}/plugins/lib64/vpp_plugins/*.so; do + echo ../${i} /usr/lib/vpp_plugins >> ${2} +done + +for i in ${1}/plugins/lib64/vpp_api_test_plugins/*.so; do + echo ../${i} /usr/lib/vpp_api_test_plugins >> ${2} +done |