From 7e013c6935818ed748ddd09c4aa37081b3a0ccf7 Mon Sep 17 00:00:00 2001 From: Christian Ehrhardt Date: Thu, 18 May 2017 10:49:58 +0200 Subject: i40e PMD / i40e vector PMD on ppc64el Change-Id: Id483b5f72c83b5f5860ea6cfb74ff21b494b1643 Signed-off-by: Christian Ehrhardt --- debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 37c14d33..5e25515d 100644 --- a/debian/control +++ b/debian/control @@ -45,7 +45,7 @@ Recommends: dpdk-igb-uio-dkms (= ${binary:Version}) [arm64], librte-pmd-ena1 (= ${binary:Version}), librte-pmd-enic1 (= ${binary:Version}) [amd64 arm64 i386], librte-pmd-fm10k1 (= ${binary:Version}) [amd64 i386], - librte-pmd-i40e1 (= ${binary:Version}) [amd64 i386], + librte-pmd-i40e1 (= ${binary:Version}) [amd64 i386 ppc64el], librte-pmd-ixgbe1 (= ${binary:Version}) [amd64 arm64 i386], librte-pmd-null-crypto1 (= ${binary:Version}), librte-pmd-null1 (= ${binary:Version}), @@ -152,7 +152,7 @@ Depends: libpcap-dev, librte-pmd-ena1 (= ${binary:Version}), librte-pmd-enic1 (= ${binary:Version}) [amd64 arm64 i386], librte-pmd-fm10k1 (= ${binary:Version}) [amd64 i386], - librte-pmd-i40e1 (= ${binary:Version}) [amd64 i386], + librte-pmd-i40e1 (= ${binary:Version}) [amd64 i386 ppc64el], librte-pmd-ixgbe1 (= ${binary:Version}) [amd64 arm64 i386], librte-pmd-null-crypto1 (= ${binary:Version}), librte-pmd-null1 (= ${binary:Version}), @@ -522,7 +522,7 @@ Description: Data Plane Development Kit (librte-pmd-fm10k runtime library) This package contains the runtime libraries for librte_pmd_fm10k. Package: librte-pmd-i40e1 -Architecture: amd64 i386 +Architecture: amd64 i386 ppc64el Multi-Arch: same Homepage: http://dpdk.org/doc/guides/nics/i40e.html Pre-Depends: ${misc:Pre-Depends} -- cgit 1.2.3-korg From 2732340d33c9b92603573a94fd42222c13031c40 Mon Sep 17 00:00:00 2001 From: Christian Ehrhardt Date: Thu, 18 May 2017 11:04:07 +0200 Subject: fix library availability/dependency Change-Id: Icd75917e74c7b629e7e43b01c2d5811c48863940 Signed-off-by: Christian Ehrhardt --- debian/control | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 5e25515d..1d75a9e8 100644 --- a/debian/control +++ b/debian/control @@ -45,7 +45,7 @@ Recommends: dpdk-igb-uio-dkms (= ${binary:Version}) [arm64], librte-pmd-ena1 (= ${binary:Version}), librte-pmd-enic1 (= ${binary:Version}) [amd64 arm64 i386], librte-pmd-fm10k1 (= ${binary:Version}) [amd64 i386], - librte-pmd-i40e1 (= ${binary:Version}) [amd64 i386 ppc64el], + librte-pmd-i40e1 (= ${binary:Version}), librte-pmd-ixgbe1 (= ${binary:Version}) [amd64 arm64 i386], librte-pmd-null-crypto1 (= ${binary:Version}), librte-pmd-null1 (= ${binary:Version}), @@ -135,7 +135,7 @@ Depends: libpcap-dev, librte-hash2 (= ${binary:Version}), librte-ip-frag1 (= ${binary:Version}), librte-jobstats1 (= ${binary:Version}), - librte-kni2 (= ${binary:Version}) [amd64 arm64], + librte-kni2 (= ${binary:Version}) [amd64 arm64 ppc64el], librte-kvargs1 (= ${binary:Version}), librte-lpm2 (= ${binary:Version}), librte-mbuf2 (= ${binary:Version}), @@ -152,7 +152,7 @@ Depends: libpcap-dev, librte-pmd-ena1 (= ${binary:Version}), librte-pmd-enic1 (= ${binary:Version}) [amd64 arm64 i386], librte-pmd-fm10k1 (= ${binary:Version}) [amd64 i386], - librte-pmd-i40e1 (= ${binary:Version}) [amd64 i386 ppc64el], + librte-pmd-i40e1 (= ${binary:Version}), librte-pmd-ixgbe1 (= ${binary:Version}) [amd64 arm64 i386], librte-pmd-null-crypto1 (= ${binary:Version}), librte-pmd-null1 (= ${binary:Version}), @@ -509,7 +509,7 @@ Description: Data Plane Development Kit (librte-pmd-enic runtime library) This package contains the runtime libraries for librte_pmd_enic. Package: librte-pmd-fm10k1 -Architecture: amd64 i386 ppc64el +Architecture: amd64 i386 Multi-Arch: same Homepage: http://dpdk.org/doc/guides/nics/fm10k.html Pre-Depends: ${misc:Pre-Depends} @@ -522,7 +522,7 @@ Description: Data Plane Development Kit (librte-pmd-fm10k runtime library) This package contains the runtime libraries for librte_pmd_fm10k. Package: librte-pmd-i40e1 -Architecture: amd64 i386 ppc64el +Architecture: amd64 arm64 i386 ppc64el Multi-Arch: same Homepage: http://dpdk.org/doc/guides/nics/i40e.html Pre-Depends: ${misc:Pre-Depends} -- cgit 1.2.3-korg From 631014b0296cfeaaabfd474cad5f3f46b3deef7a Mon Sep 17 00:00:00 2001 From: Christian Ehrhardt Date: Thu, 18 May 2017 13:36:36 +0200 Subject: d/control deps and pkg for thunderx Change-Id: Iee2c9d08e1eea34735a9b2302317bc1c8a283f48 Signed-off-by: Christian Ehrhardt --- debian/control | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 1d75a9e8..7808f6da 100644 --- a/debian/control +++ b/debian/control @@ -52,6 +52,7 @@ Recommends: dpdk-igb-uio-dkms (= ${binary:Version}) [arm64], librte-pmd-pcap1 (= ${binary:Version}), librte-pmd-qede1 (= ${binary:Version}), librte-pmd-ring2 (= ${binary:Version}), + librte-pmd-thunderx-nicvf1 (= ${binary:Version}), librte-pmd-vhost1 (= ${binary:Version}), librte-pmd-virtio1 (= ${binary:Version}), librte-pmd-vmxnet3-uio1 (= ${binary:Version}) [amd64 arm64 i386], @@ -159,6 +160,7 @@ Depends: libpcap-dev, librte-pmd-pcap1 (= ${binary:Version}), librte-pmd-qede1 (= ${binary:Version}), librte-pmd-ring2 (= ${binary:Version}), + librte-pmd-thunderx-nicvf1 (= ${binary:Version}), librte-pmd-vhost1 (= ${binary:Version}), librte-pmd-virtio1 (= ${binary:Version}), librte-pmd-vmxnet3-uio1 (= ${binary:Version}) [amd64 arm64 i386], @@ -783,6 +785,18 @@ Description: Data Plane Development Kit (librte_pdump runtime library) . This package contains the runtime libraries for librte_pdump. +Package: librte-pmd-thunderx-nicvf1 +Architecture: amd64 arm64 i386 ppc64el +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} +Conflicts: libdpdk +Description: Data Plane Development Kit (librte_pmd_thunderx_nicvf runtime library) + DPDK is a set of libraries for fast packet processing. Applications run + in user-space and communicate directly with dedicated network interfaces. + . + This package contains the runtime libraries for librte_pmd_thunderx_nicvf. + # All following packages are for ABI compatibility to older releases. # Newer DPDK versions are ABI compatible to older ones for at least one release # and more if maintainable. -- cgit 1.2.3-korg From bfc76e8a86292e59f442aba7d3cdb1510a652608 Mon Sep 17 00:00:00 2001 From: Christian Ehrhardt Date: Fri, 19 May 2017 08:54:41 +0200 Subject: debian/control: remove arm64 dkms recommends This was meant when arm64 absolutely required the dkms modules to work. But there are platforms which can work without now. We already have a arch neutral suggests, so no need to replace this. Given the complexity dkms sometimes brings on e.g. kernel updates dropping the recommends helps more systems (by avoiding those issues) than it hurts (by users of those needing it installing the dkms packages) Change-Id: I99a060092d685a8cb87db6d0259e4ab18a823d7e Signed-off-by: Christian Ehrhardt --- debian/control | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 7808f6da..e769ba30 100644 --- a/debian/control +++ b/debian/control @@ -35,9 +35,7 @@ Depends: hwdata, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Recommends: dpdk-igb-uio-dkms (= ${binary:Version}) [arm64], - dpdk-rte-kni-dkms (= ${binary:Version}) [arm64], - librte-pmd-af-packet1 (= ${binary:Version}), +Recommends: librte-pmd-af-packet1 (= ${binary:Version}), librte-pmd-bnxt1 (= ${binary:Version}), librte-pmd-bond1 (= ${binary:Version}), librte-pmd-cxgbe1 (= ${binary:Version}), -- cgit 1.2.3-korg From 8686692a718455cac01a0f78081ff8fb2193afe7 Mon Sep 17 00:00:00 2001 From: Santiago Date: Tue, 30 May 2017 09:51:23 +0200 Subject: debian/control: fix compatbility typo Change-Id: I2095f6f1292d40ead117a4d22a1dffcfa0c18b7a Gbp-Dch: Ignore Signed-off-by: Santiago --- debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index e769ba30..c842e77b 100644 --- a/debian/control +++ b/debian/control @@ -826,7 +826,7 @@ Description: Data Plane Development Kit (libethdev runtime library) DPDK is a set of libraries for fast packet processing. Applications run in user-space and communicate directly with dedicated network interfaces. . - This package contains an ABI compatbility link for an older version of the + This package contains an ABI compatibility link for an older version of the runtime libraries for libethdev. Package: librte-cryptodev1 @@ -840,7 +840,7 @@ Description: Data Plane Development Kit (librte-cryptodev runtime library) DPDK is a set of libraries for fast packet processing. Applications run in user-space and communicate directly with dedicated network interfaces. . - This package contains an ABI compatbility link for an older version of the + This package contains an ABI compatibility link for an older version of the the runtime libraries for librte_cryptodev. Package: librte-eal2 @@ -854,6 +854,6 @@ Description: Data Plane Development Kit (librte-eal runtime library) DPDK is a set of libraries for fast packet processing. Applications run in user-space and communicate directly with dedicated network interfaces. . - This package contains an ABI compatbility link for an older version of the + This package contains an ABI compatibility link for an older version of the runtime libraries for librte_eal. -- cgit 1.2.3-korg From 5f6021664aa3edf36ab7f37378c032a86bb655b2 Mon Sep 17 00:00:00 2001 From: Santiago Date: Tue, 30 May 2017 13:18:48 +0200 Subject: debian/control: remove duplicated 'the' Change-Id: I77feaaa5dfbb5cd3d1a8397dd6542192af17d46d Gbp-Dch: Ignore Signed-off-by: Santiago --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index c842e77b..9a135064 100644 --- a/debian/control +++ b/debian/control @@ -841,7 +841,7 @@ Description: Data Plane Development Kit (librte-cryptodev runtime library) in user-space and communicate directly with dedicated network interfaces. . This package contains an ABI compatibility link for an older version of the - the runtime libraries for librte_cryptodev. + runtime libraries for librte_cryptodev. Package: librte-eal2 Architecture: amd64 arm64 i386 ppc64el -- cgit 1.2.3-korg From 0af1d7eff76dcd3b78ce334c87e87822b6eecfc0 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 30 May 2017 14:13:53 +0100 Subject: Declare compliance with Debian Policy v4.0.0 Update Standards-Version to 4.0.0 Change-Id: I441d6824e122e459f058de79b6d3e30d50fad342 Signed-off-by: Luca Boccassi --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 9a135064..db3c12eb 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 9), python-sphinx-rtd-theme, texlive-fonts-recommended, texlive-latex-extra -Standards-Version: 3.9.8 +Standards-Version: 4.0.0 Section: libs Homepage: http://www.dpdk.org Vcs-Git: https://gerrit.fd.io/r/deb_dpdk -- cgit 1.2.3-korg From 6e1ca2647e3582e41dc33757c49f628f8c740388 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 12 Jun 2017 13:57:06 +0100 Subject: Generate libdpdk-dev dependencies and dpdk recommends There are many, many binary packages in DPDK, and they constantly change. To avoid having to manually maintain the list of dependencies of libdpdk-dev and recommends of dpdk, generate them at build time depending on what is actually built for each architecture. Change-Id: I19f5f037c41dc4b1d61fb5b2c00e0f005431d8f0 Signed-off-by: Luca Boccassi --- debian/control | 69 ++-------------------------------------------------------- debian/rules | 7 ++++++ 2 files changed, 9 insertions(+), 67 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index db3c12eb..57f41d78 100644 --- a/debian/control +++ b/debian/control @@ -35,26 +35,7 @@ Depends: hwdata, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Recommends: librte-pmd-af-packet1 (= ${binary:Version}), - librte-pmd-bnxt1 (= ${binary:Version}), - librte-pmd-bond1 (= ${binary:Version}), - librte-pmd-cxgbe1 (= ${binary:Version}), - librte-pmd-e1000-1 (= ${binary:Version}), - librte-pmd-ena1 (= ${binary:Version}), - librte-pmd-enic1 (= ${binary:Version}) [amd64 arm64 i386], - librte-pmd-fm10k1 (= ${binary:Version}) [amd64 i386], - librte-pmd-i40e1 (= ${binary:Version}), - librte-pmd-ixgbe1 (= ${binary:Version}) [amd64 arm64 i386], - librte-pmd-null-crypto1 (= ${binary:Version}), - librte-pmd-null1 (= ${binary:Version}), - librte-pmd-pcap1 (= ${binary:Version}), - librte-pmd-qede1 (= ${binary:Version}), - librte-pmd-ring2 (= ${binary:Version}), - librte-pmd-thunderx-nicvf1 (= ${binary:Version}), - librte-pmd-vhost1 (= ${binary:Version}), - librte-pmd-virtio1 (= ${binary:Version}), - librte-pmd-vmxnet3-uio1 (= ${binary:Version}) [amd64 arm64 i386], - librte-pmd-xenvirt1 (= ${binary:Version}) [amd64 arm64 i386] +Recommends: ${librte:Recommends}, Suggests: dpdk-doc, dpdk-igb-uio-dkms (= ${binary:Version}), dpdk-rte-kni-dkms (= ${binary:Version}), @@ -124,53 +105,7 @@ Architecture: amd64 arm64 i386 ppc64el Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: libpcap-dev, - librte-acl2 (= ${binary:Version}), - librte-cfgfile2 (= ${binary:Version}), - librte-cmdline2 (= ${binary:Version}), - librte-cryptodev2 (= ${binary:Version}), - librte-distributor1 (= ${binary:Version}), - librte-eal3 (= ${binary:Version}), - librte-ethdev5 (= ${binary:Version}), - librte-hash2 (= ${binary:Version}), - librte-ip-frag1 (= ${binary:Version}), - librte-jobstats1 (= ${binary:Version}), - librte-kni2 (= ${binary:Version}) [amd64 arm64 ppc64el], - librte-kvargs1 (= ${binary:Version}), - librte-lpm2 (= ${binary:Version}), - librte-mbuf2 (= ${binary:Version}), - librte-mempool2 (= ${binary:Version}), - librte-meter1 (= ${binary:Version}), - librte-net1 (= ${binary:Version}), - librte-pdump1 (= ${binary:Version}), - librte-pipeline3 (= ${binary:Version}), - librte-pmd-af-packet1 (= ${binary:Version}), - librte-pmd-bnxt1 (= ${binary:Version}), - librte-pmd-bond1 (= ${binary:Version}), - librte-pmd-cxgbe1 (= ${binary:Version}), - librte-pmd-e1000-1 (= ${binary:Version}), - librte-pmd-ena1 (= ${binary:Version}), - librte-pmd-enic1 (= ${binary:Version}) [amd64 arm64 i386], - librte-pmd-fm10k1 (= ${binary:Version}) [amd64 i386], - librte-pmd-i40e1 (= ${binary:Version}), - librte-pmd-ixgbe1 (= ${binary:Version}) [amd64 arm64 i386], - librte-pmd-null-crypto1 (= ${binary:Version}), - librte-pmd-null1 (= ${binary:Version}), - librte-pmd-pcap1 (= ${binary:Version}), - librte-pmd-qede1 (= ${binary:Version}), - librte-pmd-ring2 (= ${binary:Version}), - librte-pmd-thunderx-nicvf1 (= ${binary:Version}), - librte-pmd-vhost1 (= ${binary:Version}), - librte-pmd-virtio1 (= ${binary:Version}), - librte-pmd-vmxnet3-uio1 (= ${binary:Version}) [amd64 arm64 i386], - librte-pmd-xenvirt1 (= ${binary:Version}) [amd64 arm64 i386], - librte-port3 (= ${binary:Version}), - librte-power1 (= ${binary:Version}), - librte-reorder1 (= ${binary:Version}), - librte-ring1 (= ${binary:Version}), - librte-sched1 (= ${binary:Version}), - librte-table2 (= ${binary:Version}), - librte-timer1 (= ${binary:Version}), - librte-vhost3 (= ${binary:Version}), + ${librte:Depends}, ${misc:Depends} Description: Data Plane Development Kit (basic development files) DPDK is a set of libraries for fast packet processing. Applications run diff --git a/debian/rules b/debian/rules index 33b98b5a..82eb417b 100755 --- a/debian/rules +++ b/debian/rules @@ -128,6 +128,13 @@ endif override_dh_gencontrol: dh_gencontrol + # debian/files will not exist until dh_gencontrol has ran at least once, + # so we need to run gencontrol for libdpdk-dev and libdpdk-dbgsym after. + # The list of libraries and PMDs is everchanging, so generate the dependency + # list for libdpdk-dev to avoid having to maintain it manually. + # Same for the recommends list for dpdk, were we want the PMDs and the mempools. + dh_gencontrol -p libdpdk-dev -- -V"librte:Depends=`grep -E 'librte-*' ./debian/files | grep -v dbgsym | tr '_' ' ' | awk '{ print $$1,"(=",$$2 ")" }' | paste -sd ',' - | sed -e 's/,/, /g'`" + dh_gencontrol -p dpdk -- -V"librte:Recommends=`grep -E 'librte-(pmd|mempool).*' ./debian/files | grep -v dbgsym | tr '_' ' ' | awk '{ print $$1,"(=",$$2 ")" }' | paste -sd ',' - | sed -e 's/,/, /g'`" ifneq (,$(findstring kernel_modules,$(DEB_BUILD_OPTIONS))) dh_gencontrol -p dpdk-modules-$(KVERS) -- \ -v`cat debian/VERSION` \ -- cgit 1.2.3-korg From 6d0f627c533ccaeac81f11b8ea5639fd873caf61 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 13 Jun 2017 11:20:41 +0100 Subject: Remove old compatibility transitional packages Change-Id: I64ea0708cacbb657895ba2548bd3b02fac9a0c0c Signed-off-by: Luca Boccassi --- debian/control | 62 --------------------------------------- debian/libethdev4.links.in | 1 - debian/librte-cryptodev1.links.in | 1 - debian/librte-eal2.links.in | 1 - debian/rules | 15 ---------- 5 files changed, 80 deletions(-) delete mode 100644 debian/libethdev4.links.in delete mode 100644 debian/librte-cryptodev1.links.in delete mode 100644 debian/librte-eal2.links.in (limited to 'debian/control') diff --git a/debian/control b/debian/control index 57f41d78..7863adc6 100644 --- a/debian/control +++ b/debian/control @@ -730,65 +730,3 @@ Description: Data Plane Development Kit (librte_pmd_thunderx_nicvf runtime libra . This package contains the runtime libraries for librte_pmd_thunderx_nicvf. -# All following packages are for ABI compatibility to older releases. -# Newer DPDK versions are ABI compatible to older ones for at least one release -# and more if maintainable. -# -# The cross dependencies in DPDK libraries would otherwise force us to conflict -# with older ABI versions to avoid double ld.so resolution -# (https://lists.ubuntu.com/archives/ubuntu-devel/2017-February/039659.html). -# -# But the conflicts in debian/control would make the old versions and thereby -# the dependent applications non-installable until there is a rebuild (as other -# updates would do). -# But for our case that would deny most benefits of version named libraries -# (e.g. the ability to have both). -# -# Instead of adding conflicts fields - whenever possible - provide a backward -# compatible wrapper symlinking to the new (ABI compatible) implementation. -# -# Still as soon as (all) dependendent packages are rebuilt these compat -# wrappers can be autoremoved (apt will take care of that) - -Package: libethdev4 -Architecture: amd64 arm64 i386 ppc64el -Multi-Arch: same -Homepage: http://dpdk.org/doc/api/rte__ethdev_8h.html -Pre-Depends: ${misc:Pre-Depends} -Depends: librte-ethdev5, ${misc:Depends}, ${shlibs:Depends} -Conflicts: libdpdk0 -Description: Data Plane Development Kit (libethdev runtime library) - DPDK is a set of libraries for fast packet processing. Applications run - in user-space and communicate directly with dedicated network interfaces. - . - This package contains an ABI compatibility link for an older version of the - runtime libraries for libethdev. - -Package: librte-cryptodev1 -Architecture: amd64 arm64 i386 ppc64el -Multi-Arch: same -Homepage: http://dpdk.org/doc/api/rte__cryptodev_8h.html -Pre-Depends: ${misc:Pre-Depends} -Depends: librte-cryptodev2, ${misc:Depends}, ${shlibs:Depends} -Conflicts: libdpdk0 -Description: Data Plane Development Kit (librte-cryptodev runtime library) - DPDK is a set of libraries for fast packet processing. Applications run - in user-space and communicate directly with dedicated network interfaces. - . - This package contains an ABI compatibility link for an older version of the - runtime libraries for librte_cryptodev. - -Package: librte-eal2 -Architecture: amd64 arm64 i386 ppc64el -Multi-Arch: same -Homepage: http://dpdk.org/doc/api/rte__eal_8h.html -Pre-Depends: ${misc:Pre-Depends} -Depends: librte-eal3, ${misc:Depends}, ${shlibs:Depends} -Conflicts: libdpdk0 -Description: Data Plane Development Kit (librte-eal runtime library) - DPDK is a set of libraries for fast packet processing. Applications run - in user-space and communicate directly with dedicated network interfaces. - . - This package contains an ABI compatibility link for an older version of the - runtime libraries for librte_eal. - diff --git a/debian/libethdev4.links.in b/debian/libethdev4.links.in deleted file mode 100644 index 6f482f9a..00000000 --- a/debian/libethdev4.links.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/@DEB_HOST_MULTIARCH@/librte_ethdev.so.5 usr/lib/@DEB_HOST_MULTIARCH@/libethdev.so.4 diff --git a/debian/librte-cryptodev1.links.in b/debian/librte-cryptodev1.links.in deleted file mode 100644 index ddde2520..00000000 --- a/debian/librte-cryptodev1.links.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/@DEB_HOST_MULTIARCH@/librte_cryptodev.so.2 usr/lib/@DEB_HOST_MULTIARCH@/librte_cryptodev.so.1 diff --git a/debian/librte-eal2.links.in b/debian/librte-eal2.links.in deleted file mode 100644 index c6cd36a3..00000000 --- a/debian/librte-eal2.links.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/@DEB_HOST_MULTIARCH@/librte_eal.so.3 usr/lib/@DEB_HOST_MULTIARCH@/librte_eal.so.2 diff --git a/debian/rules b/debian/rules index 82eb417b..59569b9c 100755 --- a/debian/rules +++ b/debian/rules @@ -162,12 +162,6 @@ override_dh_auto_clean: sed -i '/Package: dpdk-modules-/,/`tail -n1 debian/control.modules.in`/d' debian/control test -L config/defconfig_$(DPDK_CONFIG) && rm -f config/defconfig_$(DPDK_CONFIG) || true -override_dh_clean: - dh_clean - rm -f debian/libethdev4.links - rm -f debian/librte-cryptodev1.links - rm -f debian/librte-eal2.links - override_dh_auto_configure: # Add support for a custom defconfig file in the debian directory. ifneq (,$(filter dpdk_config=%,$(DEB_BUILD_OPTIONS))) @@ -329,15 +323,6 @@ ifneq (,$(KVERS)) DESTDIR=debian/dpdk-modules-$(KVERS) install-kmod endif -debian/libethdev4.links: debian/libethdev4.links.in - sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' < $< > $@ -debian/librte-cryptodev1.links: debian/librte-cryptodev1.links.in - sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' < $< > $@ -debian/librte-eal2.links: debian/librte-eal2.links.in - sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' < $< > $@ -override_dh_link: debian/libethdev4.links debian/librte-cryptodev1.links debian/librte-eal2.links - dh_link - override_dh_dkms: dh_dkms -V $(VERSION) -- cgit 1.2.3-korg From b89cea16f018bc65908b085b157ce8f0b4a8fd4c Mon Sep 17 00:00:00 2001 From: "Charles (Chas) Williams" Date: Wed, 14 Jun 2017 13:13:01 +0100 Subject: Fix upstream documentation links in d/control Change-Id: Id08865ce8f7a1991970e4be664497b3cac6e196d Signed-off-by: Luca Boccassi --- debian/control | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 7863adc6..8963f098 100644 --- a/debian/control +++ b/debian/control @@ -131,7 +131,7 @@ Description: Data Plane Development Kit (libethdev runtime library) Package: librte-acl2 Architecture: amd64 arm64 i386 ppc64el Multi-Arch: same -Homepage: http://dpdk.org/doc/api/rte__ethdev_8h.html +Homepage: http://dpdk.org/doc/api/rte__acl_8h.html Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Conflicts: libdpdk0 @@ -157,6 +157,7 @@ Description: Data Plane Development Kit (librte-cfgfile runtime library) Package: librte-cmdline2 Architecture: amd64 arm64 i386 ppc64el Multi-Arch: same +Homepage: http://dpdk.org/doc/api/cmdline_8h.html Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Conflicts: libdpdk0 @@ -369,6 +370,7 @@ Description: Data Plane Development Kit (librte-pmd-af-packet runtime library) Package: librte-pmd-bnxt1 Architecture: amd64 arm64 i386 ppc64el Multi-Arch: same +Homepage: http://dpdk.org/doc/guides/nics/bnxt.html Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Conflicts: libdpdk0 @@ -696,7 +698,7 @@ Description: Data Plane Development Kit (librte_timer runtime library) Package: librte-vhost3 Architecture: amd64 arm64 i386 ppc64el Multi-Arch: same -Homepage: http://dpdk.org/doc/api/rte__virtio__net_8h.html +Homepage: http://dpdk.org/doc/api/rte__vhost_8h.html Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Conflicts: libdpdk0 -- cgit 1.2.3-korg