diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2016-09-29 18:18:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2016-09-29 18:18:37 +0000 |
| commit | b6a44972963051e04cbdc00a7810c9d900be004e (patch) | |
| tree | 71673c1db653c444b5bfe482462fad554b6aeae0 /debian/rules | |
| parent | f1196bae2634ee36dd5bbc2dcc6aad5238faa7e9 (diff) | |
| parent | fe79dd192a7d47562967c72d748eb9d872633f48 (diff) | |
Merge changes from topic 'fix-autoloader' into deb_dpdk_16.07
* changes:
changelog: add PMDs as recommend for dpdk runtime
add PMDs as recommend for dpdk runtime.
add empty RTE_EAL_PMD_PATH dir to librte_eal
changelog: utilize RTE_EAL_PMD_PATH
document pmd autoloading
utilize RTE_EAL_PMD_PATH
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/debian/rules b/debian/rules index 064ffc3b..ccd61406 100755 --- a/debian/rules +++ b/debian/rules @@ -129,6 +129,7 @@ ifeq (,$(filter dpdk_config=%,$(DEB_BUILD_OPTIONS))) -e 's,(CONFIG_RTE_KNI_KMOD=).*,\1$(DPDK_CONFIG_BUILD_KMOD),' \ -e 's,(LIBRTE_PMD_PCAP=).*,\1y,' \ -e 's,(LIBRTE_PMD_XENVIRT=).*,\1y,' \ + -e 's,(CONFIG_RTE_EAL_PMD_PATH=).*,\1"/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/dpdk-pmds/",' \ $(DPDK_STATIC_DIR)/.config # xen not available on ppc64el ifneq (,$(filter $(DEB_HOST_ARCH), ppc64el)) @@ -206,9 +207,19 @@ override_dh_auto_install-arch: else \ PKG=$${LN}$${VER}; \ fi; \ + LIBF="$$(basename $${lib})"; \ + LIBD="debian/$${PKG}/$(LIBDIR)"; \ echo "moving $${lib} for library $${PKG}"; \ - mkdir -p debian/$${PKG}/$(LIBDIR); \ - mv $${lib} debian/$${PKG}/$(LIBDIR); \ + mkdir -p $${LIBD}; \ + mv $${lib} $${LIBD}; \ + if [ "$${LIBF#librte_pmd_}x" != "$${LIBF}x" ]; then \ + mkdir -p $${LIBD}/dpdk-pmds; \ + echo "PMD: linking $${LIBF} into RTE_EAL_PMD_PATH at $${LIBD}/dpdk-pmds/"; \ + ln -s --relative --target-directory=$${LIBD}/dpdk-pmds/ $${LIBD}/$${LIBF}; \ + fi; \ + if [ "$${LIBF#librte_eal}x" != "$${LIBF}x" ]; then \ + mkdir -p $${LIBD}/dpdk-pmds; \ + fi; \ done # pkg-config mkdir -p debian/libdpdk-dev/$(LIBDIR)/pkgconfig |