d/rules: d/control: drop the majority of PMDs to suggest and select only a common... 74/15974/1
authorChristian Ehrhardt <christian.ehrhardt@canonical.com>
Thu, 15 Nov 2018 15:15:20 +0000 (16:15 +0100)
committerChristian Ehrhardt <christian.ehrhardt@canonical.com>
Thu, 15 Nov 2018 15:15:20 +0000 (16:15 +0100)
Change-Id: I1c88c888206196c727a1902f7ec8008af6b6dee1
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
debian/control
debian/rules

index a8708e5..fcf1bd7 100644 (file)
@@ -44,12 +44,30 @@ Depends: hwdata,
          ${misc:Depends},
          ${python3:Depends},
          ${shlibs:Depends}
-Recommends: ${librte:Recommends},
-            python3-pyelftools,
+Recommends: python3-pyelftools,
+            librte-mempool18.11,
+            librte-pmd-af-packet18.11,
+            librte-pmd-bond18.11,
+            librte-pmd-e1000-18.11,
+            librte-pmd-i40e18.11,
+            librte-pmd-ixgbe18.11,
+            librte-pmd-fm10k18.11,
+            librte-pmd-mlx4-18.11,
+            librte-pmd-mlx5-18.11,
+            librte-pmd-thunderx18.11,
+            librte-pmd-kni18.11,
+            librte-pmd-netvsc18.11,
+            librte-pmd-vdev-netvsc18.11,
+            librte-pmd-vhost18.11,
+            librte-pmd-virtio18.11,
+            librte-pmd-vmxnet3-18.11,
+            librte-pmd-tap18.11,
+            librte-pmd-pcap18.11,
 Suggests: dpdk-doc,
           dpdk-igb-uio-dkms (= ${binary:Version}),
           dpdk-rte-kni-dkms (= ${binary:Version}),
           linux-image-generic,
+          ${librte:Suggests},
 Breaks: dpdk-dev (<< 18.11)
 Replaces: dpdk-dev (<< 18.11)
 Description: Data Plane Development Kit (runtime)
index a2c553c..3d2be92 100755 (executable)
@@ -86,7 +86,7 @@ override_dh_gencontrol:
        # 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'`"
+       dh_gencontrol -p dpdk -- -V"librte:Suggests=`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` \