Drop dpdk-dev SDK

Make dpdk-dev a transitional dummy package, as with pkgconfig upstream
support it's no longer necessary for third parties to use the dpdk
specific SDK.

Change-Id: Ib3710d1c806d0017759599615884da3c133612ae
Signed-off-by: Luca Boccassi <[email protected]>

diff --git a/debian/control b/debian/control
index abaa07f..f673b1d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -56,15 +56,14 @@ Description: Data Plane Development Kit (runtime)
  This package contains the runtime environment to run DPDK applications.
 
 Package: dpdk-dev
-Section: devel
-Architecture: amd64 arm64 armhf i386 ppc64el
-Depends: libdpdk-dev (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Description: Data Plane Development Kit (development files)
+Section: oldlibs
+Architecture: all
+Depends: libdpdk-dev (>= ${source:Version}), ${misc:Depends},
+Description: transitional package
  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 examples and the upstream build environment. It is
- not strictly required in order to build external applications.
+ This is a transitional package. It can safely be removed.
 
 Package: dpdk-doc
 Section: doc
@@ -84,7 +83,6 @@ Package: dpdk-igb-uio-dkms
 Section: kernel
 Architecture: amd64 arm64 i386 ppc64el
 Depends: dkms,
-         dpdk-dev (= ${binary:Version}),
          libdpdk-dev (= ${binary:Version}),
          make,
          ${misc:Depends}
@@ -98,7 +96,6 @@ Package: dpdk-rte-kni-dkms
 Section: kernel
 Architecture: amd64 arm64 i386 ppc64el
 Depends: dkms,
-         dpdk-dev (= ${binary:Version}),
          libdpdk-dev (= ${binary:Version}),
          make,
          ${misc:Depends}

diff --git a/debian/dpdk-dev.lintian-overrides b/debian/dpdk-dev.lintian-overrides
deleted file mode 100644 (file)
index 2d24d92..0000000
--- a/debian/dpdk-dev.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# Upstream distributes it like this, these are binaries which are
-# part of the sdk which is shipped in dpdk-dev.
-dpdk-dev: arch-dependent-file-in-usr-share

diff --git a/debian/dpdk-dev.preinst.in b/debian/dpdk-dev.preinst.in
deleted file mode 100644 (file)
index 027e2cf..0000000
--- a/debian/dpdk-dev.preinst.in
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-# preinst script for dpdk-dev
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    upgrade)
-        # include used to be a symlink to /usr/include/dpdk but to support
-        # multiarch it was changed to a full copy, but dpkg will not
-        # substitute a symlink with a directory by itself, see #626203
-        if [ -L /usr/share/dpdk/@@RTE_TARGET@@/include ] ; then
-            rm /usr/share/dpdk/@@RTE_TARGET@@/include
-        fi
-    ;;
-
-    install|abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0

diff --git a/debian/dpdk-igb-uio-dkms.dkms.in b/debian/dpdk-igb-uio-dkms.dkms.in
index 29ce242..7e6ed2b 100644 (file)
--- a/debian/dpdk-igb-uio-dkms.dkms.in
+++ b/debian/dpdk-igb-uio-dkms.dkms.in
@@ -1,7 +1,7 @@
 PACKAGE_NAME="dpdk-igb-uio"
 PACKAGE_VERSION="#MODULE_VERSION#"
 BUILT_MODULE_NAME[0]="igb_uio"
-MAKE="source /usr/share/dpdk/dpdk-sdk-env.sh; make MODULE_CFLAGS='-I/usr/include/@@DEB_HOST_MULTIARCH@@/dpdk -include /usr/include/@@DEB_HOST_MULTIARCH@@/dpdk/rte_config.h -I/usr/include/dpdk -fno-PIE' RTE_KERNELDIR=/lib/modules/${kernelver}/build"
-CLEAN="source /usr/share/dpdk/dpdk-sdk-env.sh; make clean"
+MAKE="make -C $kernel_source_dir M=$dkms_tree/$PACKAGE_NAME/$PACKAGE_VERSION/build MODULE_CFLAGS='-I/usr/include/@@DEB_HOST_MULTIARCH@@/dpdk -include /usr/include/@@DEB_HOST_MULTIARCH@@/dpdk/rte_config.h -I/usr/include/dpdk -fno-PIE' modules"
+CLEAN="make -C $kernel_source_dir M=$dkms_tree/$PACKAGE_NAME/$PACKAGE_VERSION/build clean"
 DEST_MODULE_LOCATION[0]="/updates/dkms"
 AUTOINSTALL="YES"

diff --git a/debian/dpdk-rte-kni-dkms.dkms.in b/debian/dpdk-rte-kni-dkms.dkms.in
index 24d7a61..3ed6ca8 100644 (file)
--- a/debian/dpdk-rte-kni-dkms.dkms.in
+++ b/debian/dpdk-rte-kni-dkms.dkms.in
@@ -1,7 +1,7 @@
 PACKAGE_NAME="dpdk-rte-kni"
 PACKAGE_VERSION="#MODULE_VERSION#"
 BUILT_MODULE_NAME[0]="rte_kni"
-MAKE="source /usr/share/dpdk/dpdk-sdk-env.sh; make MODULE_CFLAGS='-I/usr/include/@@DEB_HOST_MULTIARCH@@/dpdk -include /usr/include/@@DEB_HOST_MULTIARCH@@/dpdk/rte_config.h -I/usr/include/dpdk -I$source_tree/dpdk-rte-kni-#MODULE_VERSION#/ethtool/ixgbe -I$source_tree/dpdk-rte-kni-#MODULE_VERSION#/ethtool/igb -fno-PIE' RTE_KERNELDIR=/lib/modules/${kernelver}/build"
-CLEAN="source /usr/share/dpdk/dpdk-sdk-env.sh; make clean"
+MAKE="make -C $kernel_source_dir M=$dkms_tree/$PACKAGE_NAME/$PACKAGE_VERSION/build src=$source_tree/$PACKAGE_NAME-$PACKAGE_VERSION MODULE_CFLAGS='-I/usr/include/@@DEB_HOST_MULTIARCH@@/dpdk -include /usr/include/@@DEB_HOST_MULTIARCH@@/dpdk/rte_config.h -I/usr/include/dpdk -I$source_tree/$PACKAGE_NAME-$PACKAGE_VERSION/ethtool/ixgbe -I$source_tree/$PACKAGE_NAME-$PACKAGE_VERSION/ethtool/igb -fno-PIE' modules"
+CLEAN="make -C $kernel_source_dir M=$dkms_tree/$PACKAGE_NAME/$PACKAGE_VERSION/build clean"
 DEST_MODULE_LOCATION[0]="/updates/dkms"
 AUTOINSTALL="YES"

diff --git a/debian/rules b/debian/rules
index 68eaaa7..3ce83b9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -104,7 +104,6 @@ override_dh_auto_clean:
                debian/control.modules debian/VERSION
        sed -i '/Package: dpdk-modules-/,/`tail -n1 debian/control.modules.in`/d' debian/control
        rm -f debian/dpdk-igb-uio-dkms.dkms debian/dpdk-rte-kni-dkms.dkms
-       rm -f debian/dpdk-dev.preinst
        dh_auto_clean
 
 override_dh_auto_configure:
@@ -129,8 +128,6 @@ override_dh_auto_install-indep:
 
 override_dh_auto_install-arch:
        dh_auto_install
-       # generate the preinst to deal with the symlink -> directory transition smoothly
-       sed "s/@@RTE_TARGET@@/$(RTE_TARGET)/g" debian/dpdk-dev.preinst.in > debian/dpdk-dev.preinst
        # have the DKMS build include the correct per-arch directory
        sed "s/@@DEB_HOST_MULTIARCH@@/$(DEB_HOST_MULTIARCH)/g" debian/dpdk-igb-uio-dkms.dkms.in > debian/dpdk-igb-uio-dkms.dkms
        sed "s/@@DEB_HOST_MULTIARCH@@/$(DEB_HOST_MULTIARCH)/g" debian/dpdk-rte-kni-dkms.dkms.in > debian/dpdk-rte-kni-dkms.dkms