Switch to Meson

Switch build system from the legacy makefiles to Meson.
Add build dependencies on Meson and pkg-config, update package
names to match the shared library files and their symbols files,
use dh_install instead of manually copying files, delete pkg-config
file as it's provided upstream.

Change-Id: I43271c311736f94a96e55b72b0a056ac45d8eb62
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>

18 files changed, 90 insertions, 295 deletions

diff --git a/debian/control b/debian/control
index 41bce692..149396f8 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,8 @@ Build-Depends: debhelper (>= 10),
                libmnl-dev,
                libnuma-dev [!armhf],
                libssl-dev,
+               meson (>= 0.41~),
+               pkg-config,
                python3,
                python3-sphinx <!nodoc>,
                python3-sphinx-rtd-theme <!nodoc>,
@@ -931,18 +933,18 @@ Description: Data Plane Development Kit (librte-pmd-virtio runtime library)
  .
  This package contains the runtime libraries for librte_pmd_virtio.
 
-Package: librte-pmd-vmxnet3-uio18.08
+Package: librte-pmd-vmxnet3-18.08
 Architecture: amd64 arm64 i386
 Multi-Arch: same
 Homepage: https://dpdk.org/doc/guides/nics/vmxnet3.html
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte-pmd-vmxnet3-uio runtime library)
+Description: Data Plane Development Kit (librte-pmd-vmxnet3 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_vmxnet3_uio.
+ This package contains the runtime libraries for librte_pmd_vmxnet3.
 
 Package: librte-pmd-qat18.08
 Architecture: amd64 arm64 armhf i386 ppc64el
@@ -1307,17 +1309,17 @@ Description: Data Plane Development Kit (librte_pmd_kni runtime library)
  .
  This package contains the runtime libraries for librte_pmd_kni.
 
-Package: librte-pmd-lio18.08
+Package: librte-pmd-liquidio18.08
 Architecture: amd64 arm64 armhf i386 ppc64el
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte_pmd_lio runtime library)
+Description: Data Plane Development Kit (librte_pmd_liquidio 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_lio.
+ This package contains the runtime libraries for librte_pmd_liquidio.
 
 Package: librte-pmd-nfp18.08
 Architecture: amd64 arm64 armhf i386 ppc64el
@@ -1343,28 +1345,28 @@ Description: Data Plane Development Kit (librte_mempool_octeontx runtime library
  .
  This package contains the runtime libraries for librte_common_octeontx.
 
-Package: librte-pmd-octeontx-ssovf18.08
+Package: librte-pmd-octeontx-event18.08
 Architecture: amd64 arm64 armhf i386 ppc64el
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte_pmd_octeontx_ssovf runtime library)
+Description: Data Plane Development Kit (librte_pmd_octeontx_event 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_octeontx_ssovf.
+ This package contains the runtime libraries for librte_pmd_octeontx_event.
 
-Package: librte-pmd-octeontx-zip18.08
+Package: librte-pmd-octeontx-compress18.08
 Architecture: amd64 arm64 armhf i386 ppc64el
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Data Plane Development Kit (librte_pmd_octeontx_zip runtime library)
+Description: Data Plane Development Kit (librte_pmd_octeontx_compress 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_octeontx_zip.
+ This package contains the runtime libraries for librte_pmd_octeontx_compress.
 
 Package: librte-pmd-octeontx18.08
 Architecture: amd64 arm64 armhf i386 ppc64el
@@ -1390,17 +1392,17 @@ Description: Data Plane Development Kit (librte_pmd_opdl_event runtime library)
  .
  This package contains the runtime libraries for librte_pmd_opdl_event.
 
-Package: librte-pmd-sfc-efx18.08
+Package: librte-pmd-sfc18.08
 Architecture: amd64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte_pmd_sfc_efx runtime library)
+Description: Data Plane Development Kit (librte_pmd_sfc 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_sfc_efx.
+ This package contains the runtime libraries for librte_pmd_sfc.
 
 Package: librte-pmd-skeleton-event18.08
 Architecture: amd64 arm64 armhf i386 ppc64el
@@ -1438,17 +1440,17 @@ Description: Data Plane Development Kit (librte_pmd_tap runtime library)
  .
  This package contains the runtime libraries for librte_pmd_tap.
 
-Package: librte-pmd-thunderx-nicvf18.08
+Package: librte-pmd-thunderx18.08
 Architecture: amd64 arm64 armhf i386 ppc64el
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Conflicts: libdpdk0
-Description: Data Plane Development Kit (librte_pmd_thunderx_nicvf runtime library)
+Description: Data Plane Development Kit (librte_pmd_thunderx 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.
+ This package contains the runtime libraries for librte_pmd_thunderx.
 
 Package: librte-pmd-mlx4-18.08
 Architecture: amd64 arm64 i386 ppc64el
diff --git a/debian/dpdk-doc.install b/debian/dpdk-doc.install
new file mode 100644
index 00000000..1b60d123
--- /dev/null
+++ b/debian/dpdk-doc.install
@@ -0,0 +1,4 @@
+obj-*/doc/api/api usr/share/doc/dpdk
+obj-*/doc/guides/guides usr/share/doc/dpdk
+doc/guides/custom.css usr/share/doc/dpdk/guides/_static/css
+examples usr/share/dpdk
diff --git a/debian/dpdk-init b/debian/dpdk-init
index 103488ed..3938a3ba 100755
--- a/debian/dpdk-init
+++ b/debian/dpdk-init
@@ -20,7 +20,7 @@
 #
 set -e
 
-DPDK_BIND="/sbin/dpdk-devbind"
+DPDK_BIND="/usr/bin/dpdk-devbind.py"
 DPDK_INTERF="/etc/dpdk/interfaces"
 
 
diff --git a/debian/dpdk.install b/debian/dpdk.install
index 24c8d452..4f243171 100644
--- a/debian/dpdk.install
+++ b/debian/dpdk.install
@@ -1,2 +1,4 @@
+debian/interfaces	etc/dpdk/
 debian/dpdk-init	lib/dpdk/
 debian/dpdk.conf	etc/dpdk/
+usr/bin
diff --git a/debian/dpdk.interfaces b/debian/interfaces
index 3442343b..3442343b 100644
--- a/debian/dpdk.interfaces
+++ b/debian/interfaces
diff --git a/debian/libdpdk-dev.install b/debian/libdpdk-dev.install
new file mode 100644
index 00000000..c5360067
--- /dev/null
+++ b/debian/libdpdk-dev.install
@@ -0,0 +1,5 @@
+usr/include
+usr/lib/*/*.a
+usr/lib/*/*.so
+usr/lib/*/*/*/*.so
+usr/lib/*/pkgconfig
diff --git a/debian/libdpdk.pc.in b/debian/libdpdk.pc.in
deleted file mode 100644
index cd6c3fcb..00000000
--- a/debian/libdpdk.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${prefix}/lib/@DEB_HOST_MULTIARCH@
-includedir=${prefix}/include
-include_arch_dir=${prefix}/include/@DEB_HOST_MULTIARCH@
-
-Name: dpdk
-Description: Data Plane Development Kit library
-Version: @VERSION@
-Libs: -L${libdir} @DPDK_LIBS@ -ldl -lm -lpthread -lz
-Cflags: -include ${include_arch_dir}/dpdk/rte_config.h -I${include_arch_dir}/dpdk -I${includedir}/dpdk
diff --git a/debian/librte-pmd-ixgbe18.08.symbols b/debian/librte-pmd-ixgbe18.08.symbols
index f50f043e..ac89ba60 100644
--- a/debian/librte-pmd-ixgbe18.08.symbols
+++ b/debian/librte-pmd-ixgbe18.08.symbols
@@ -5,6 +5,15 @@ librte_pmd_ixgbe.so.18.08 librte-pmd-ixgbe18.08 #MINVER#
  DPDK_17.08@DPDK_17.08 17.08
  DPDK_2.0@DPDK_2.0 16.04
  EXPERIMENTAL@EXPERIMENTAL 18.05
+ rte_pmd_ixgbe_bypass_event_show@DPDK_17.08 18.08
+ rte_pmd_ixgbe_bypass_event_store@DPDK_17.08 18.08
+ rte_pmd_ixgbe_bypass_init@DPDK_17.08 18.08
+ rte_pmd_ixgbe_bypass_state_set@DPDK_17.08 18.08
+ rte_pmd_ixgbe_bypass_state_show@DPDK_17.08 18.08
+ rte_pmd_ixgbe_bypass_ver_show@DPDK_17.08 18.08
+ rte_pmd_ixgbe_bypass_wd_reset@DPDK_17.08 18.08
+ rte_pmd_ixgbe_bypass_wd_timeout_show@DPDK_17.08 18.08
+ rte_pmd_ixgbe_bypass_wd_timeout_store@DPDK_17.08 18.08
  rte_pmd_ixgbe_macsec_config_rxsc@DPDK_17.02 17.05
  rte_pmd_ixgbe_macsec_config_txsc@DPDK_17.02 17.05
  rte_pmd_ixgbe_macsec_disable@DPDK_17.02 17.05
diff --git a/debian/librte-pmd-lio18.08.symbols b/debian/librte-pmd-liquidio18.08.symbols
index 0d6c257f..249f2d07 100644
--- a/debian/librte-pmd-lio18.08.symbols
+++ b/debian/librte-pmd-liquidio18.08.symbols
@@ -1,4 +1,4 @@
-librte_pmd_lio.so.18.08 librte-pmd-lio18.08 #MINVER#
+librte_pmd_liquidio.so.18.08 librte-pmd-liquidio18.08 #MINVER#
  DPDK_17.05@DPDK_17.05 17.05
 # INFO: this library exports no symbols, essentially it is a driver that
 # registers itself on load and is then only driven by callbacks.
diff --git a/debian/librte-pmd-octeontx-compress18.08.symbols b/debian/librte-pmd-octeontx-compress18.08.symbols
new file mode 100644
index 00000000..7d17c3df
--- /dev/null
+++ b/debian/librte-pmd-octeontx-compress18.08.symbols
@@ -0,0 +1,2 @@
+librte_pmd_octeontx_compress.so.18.08 librte-pmd-octeontx-compress18.08 #MINVER#
+ DPDK_18.08@DPDK_18.08 18.08
diff --git a/debian/librte-pmd-octeontx-event18.08.symbols b/debian/librte-pmd-octeontx-event18.08.symbols
new file mode 100644
index 00000000..bdf16846
--- /dev/null
+++ b/debian/librte-pmd-octeontx-event18.08.symbols
@@ -0,0 +1,2 @@
+librte_pmd_octeontx_event.so.18.08 librte-pmd-octeontx-event18.08 #MINVER#
+ DPDK_17.05@DPDK_17.05 17.05
diff --git a/debian/librte-pmd-octeontx-ssovf18.08.symbols b/debian/librte-pmd-octeontx-ssovf18.08.symbols
deleted file mode 100644
index e1e5dd89..00000000
--- a/debian/librte-pmd-octeontx-ssovf18.08.symbols
+++ /dev/null
@@ -1,2 +0,0 @@
-librte_pmd_octeontx_ssovf.so.18.08 librte-pmd-octeontx-ssovf18.08 #MINVER#
- DPDK_17.05@DPDK_17.05 17.05
diff --git a/debian/librte-pmd-octeontx-zip18.08.symbols b/debian/librte-pmd-octeontx-zip18.08.symbols
deleted file mode 100644
index 7ccb2625..00000000
--- a/debian/librte-pmd-octeontx-zip18.08.symbols
+++ /dev/null
@@ -1,2 +0,0 @@
-librte_pmd_octeontx_zip.so.18.08 librte-pmd-octeontx-zip18.08 #MINVER#
- DPDK_18.08@DPDK_18.08 18.08
diff --git a/debian/librte-pmd-octeontx18.08.symbols b/debian/librte-pmd-octeontx18.08.symbols
new file mode 100644
index 00000000..d7753f76
--- /dev/null
+++ b/debian/librte-pmd-octeontx18.08.symbols
@@ -0,0 +1,4 @@
+librte_pmd_octeontx.so.18.08 librte-pmd-octeontx18.08 #MINVER#
+ DPDK_17.11@DPDK_17.11 17.11
+ DPDK_18.02@DPDK_18.02 18.02
+ rte_octeontx_pchan_map@DPDK_18.02 18.02
diff --git a/debian/librte-pmd-sfc-efx18.08.symbols b/debian/librte-pmd-sfc18.08.symbols
index 37eab992..e57c6db5 100644
--- a/debian/librte-pmd-sfc-efx18.08.symbols
+++ b/debian/librte-pmd-sfc18.08.symbols
@@ -1,4 +1,4 @@
-librte_pmd_sfc_efx.so.18.08 librte-pmd-sfc-efx18.08 #MINVER#
+librte_pmd_sfc.so.18.08 librte-pmd-sfc18.08 #MINVER#
  DPDK_17.02@DPDK_17.02 17.05
 # INFO: this library exports no symbols, essentially it is a driver that
 # registers itself on load and is then only driven by callbacks.
diff --git a/debian/librte-pmd-thunderx-nicvf18.08.symbols b/debian/librte-pmd-thunderx18.08.symbols
index a7c709ff..45070826 100644
--- a/debian/librte-pmd-thunderx-nicvf18.08.symbols
+++ b/debian/librte-pmd-thunderx18.08.symbols
@@ -1,4 +1,4 @@
-librte_pmd_thunderx_nicvf.so.18.08 librte-pmd-thunderx-nicvf18.08 #MINVER#
+librte_pmd_thunderx.so.18.08 librte-pmd-thunderx18.08 #MINVER#
 # was not built before 17.05
  DPDK_16.07@DPDK_16.07 17.05
 # INFO: this library exports no symbols, essentially it is a driver that
diff --git a/debian/librte-pmd-vmxnet3-uio18.08.symbols b/debian/librte-pmd-vmxnet3-18.08.symbols
index a53b08e0..90b34568 100644
--- a/debian/librte-pmd-vmxnet3-uio18.08.symbols
+++ b/debian/librte-pmd-vmxnet3-18.08.symbols
@@ -1,4 +1,4 @@
-librte_pmd_vmxnet3_uio.so.18.08 librte-pmd-vmxnet3-uio18.08 #MINVER#
+librte_pmd_vmxnet3.so.18.08 librte-pmd-vmxnet3-18.08 #MINVER#
  DPDK_2.0@DPDK_2.0 16.04
 # INFO: this library exports no symbols, essentially it is a driver that
 # registers itself on load and is then only driven by callbacks.
diff --git a/debian/rules b/debian/rules
index 27879851..90b7db6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,100 +1,33 @@
 #!/usr/bin/make -f
 
 # see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
+DPKG_EXPORT_BUILDFLAGS = 1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
 include /usr/share/dpkg/default.mk
 
 DPDK_ABI := $(shell echo $(DEB_VERSION_UPSTREAM) | cut -d '-' -f1 | cut -d '.'  -f1-2 | cut -d '~' -f1)
-DPDK_DRIVER_DIR ?= dpdk-$(DPDK_ABI)-drivers
-
-# see FEATURE AREAS in dpkg-buildflags(1)
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie
-
-# see ENVIRONMENT in dpkg-buildflags(1)
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
 
 ifeq (,$(findstring terse,$(DEB_BUILD_OPTIONS)))
 	export DH_VERBOSE=1
 	export DH_OPTIONS=-v
 endif
 
-# Support backporting to jessie
-dpkg_version_lt = $(shell dpkg --compare-versions $$(dpkg --status dpkg-dev | grep Version | cut -d' ' -f2) lt-nl "1.18.11" && echo yes)
-ifeq (yes, $(dpkg_version_lt))
-	# package maintainers to append CFLAGS
-	# For Debian, dpkg-dev >= 1.18.11 and gcc 6.x, dpkg-buildflags and gcc
-	# handle -fPIC and related flags relying on specs files
-	# (/usr/share/dpkg/*specs)
-	export DEB_CFLAGS_MAINT_APPEND  = -fPIC
-	export EXTRA_CFLAGS=$(CFLAGS)
-	export EXTRA_CPPFLAGS=$(CPPFLAGS)
-	export HOST_EXTRA_CFLAGS=$(CFLAGS)
-	export HOST_EXTRA_CPPFLAGS=$(CPPFLAGS)
-	# need to be stripped as DPDK build system adds them and it would be -Wl,-Wl,opt
-	export EXTRA_LDFLAGS=$(shell echo $(LDFLAGS) | sed 's/-Wl,//g')
-	# HOST_CC build system does not add -Wl ...
-	export EXTRA_HOST_LDFLAGS=$(LDFLAGS)
-endif
-
-export RTE_DEVEL_BUILD=n
-export EXTRA_CFLAGS+=-g
-
-# People rebuilding this package can overwrite DPDK_CONFIG, RTE_MACHINE and
-# RTE_TARGET via DEB_BUILD_OPTIONS if they like
-ifneq (,$(filter dpdk_config=%,$(DEB_BUILD_OPTIONS)))
-    DPDK_CONFIG ?= $(patsubst dpdk_config=%,%,$(filter dpdk_config=%,$(DEB_BUILD_OPTIONS)))
-endif
-ifneq (,$(filter rte_machine=%,$(DEB_BUILD_OPTIONS)))
-    RTE_MACHINE ?= $(patsubst rte_machine=%,%,$(filter rte_machine=%,$(DEB_BUILD_OPTIONS)))
-endif
-ifneq (,$(filter rte_target=%,$(DEB_BUILD_OPTIONS)))
-    RTE_TARGET ?= $(patsubst rte_target=%,%,$(filter rte_target=%,$(DEB_BUILD_OPTIONS)))
-endif
-
-ifneq (,$(filter $(DEB_HOST_ARCH), arm64))
-DPDK_CONFIG ?= "arm64-armv8a-linuxapp-gcc"
-RTE_MACHINE ?= "armv8a"
-RTE_TARGET ?= "arm64-armv8a-linuxapp-gcc"
-INCLUDE_ARCH := arm
-else
-ifneq (,$(filter $(DEB_HOST_ARCH), armhf))
-DPDK_CONFIG ?= "arm-armv7a-linuxapp-gcc"
-RTE_MACHINE ?= "armv7a"
-RTE_TARGET ?= "arm-armv7a-linuxapp-gcc"
-INCLUDE_ARCH := arm
-else
-ifneq (,$(filter $(DEB_HOST_ARCH), ppc64el))
-DPDK_CONFIG ?= "ppc_64-power8-linuxapp-gcc"
-RTE_MACHINE ?= "power8"
-RTE_TARGET ?= "ppc_64-power8-linuxapp-gcc"
-INCLUDE_ARCH := ppc_64
-else
-DPDK_CONFIG ?= "$(DEB_HOST_GNU_CPU)-native-linuxapp-gcc"
-RTE_MACHINE ?= "default"
-RTE_TARGET ?= "$(DEB_HOST_GNU_CPU)-default-linuxapp-gcc"
-INCLUDE_ARCH := x86
-endif
-endif
-endif
-DPDK_STATIC_DIR = "debian/build/static-root"
-DPDK_SHARED_DIR = "debian/build/shared-root"
-
 # now stable with parallel comilation, so support -j
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
     PAR := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
     MAKEFLAGS += -j$(PAR)
 endif
 
+ifneq (,$(findstring nodoc,$(DEB_BUILD_PROFILES)))
+BUILD_DOCS=n
+else
 ifneq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS)))
 BUILD_DOCS=n
+# to stop dh_installdoc from running
+export DEB_BUILD_PROFILES += nodoc
 else
 BUILD_DOCS=y
 endif
-
-ifneq (,$(findstring nostatic,$(DEB_BUILD_OPTIONS)))
-BUILD_STATIC_LIB=n
-else
-BUILD_STATIC_LIB=y
 endif
 
 # kernel_modules can be passed via DEB_BUILD_OPTIONS to enable building the
@@ -102,7 +35,7 @@ endif
 # the current kernel, or ksrc can be passed with a path to the target kernel
 # sources instead.
 ifeq (,$(findstring kernel_modules,$(DEB_BUILD_OPTIONS)))
-DPDK_CONFIG_BUILD_KMOD=n
+DPDK_CONFIG_BUILD_KMOD=false
 KSRC=""
 else
 ifneq (,$(filter ksrc=%,$(DEB_BUILD_OPTIONS)))
@@ -115,7 +48,7 @@ KVERS := $(shell perl debian/kernel-version $(KSRC))
 export KVERS
 export MODULE_CFLAGS=-fno-PIE
 
-DPDK_CONFIG_BUILD_KMOD=y
+DPDK_CONFIG_BUILD_KMOD=true
 
 # Since the binary module package is generated at build time depending on the
 # local kernel version, we have to append the new package in d/control.
@@ -130,11 +63,11 @@ build:
 	fi
 	sh debian/prep-modules $(KSRC)
 	cat debian/control.modules >> debian/control
-	dh $@ --with python3,dkms,systemd
+	dh $@ --with python3,dkms,systemd --buildsystem=meson
 endif
 
 %:
-	dh $@ --with python3,dkms,systemd
+	dh $@ --with python3,dkms,systemd --buildsystem=meson
 
 override_dh_gencontrol:
 	dh_gencontrol
@@ -170,213 +103,60 @@ override_dh_auto_clean:
 	rm -rf debian/build debian/tmp debian/dpdk-modules-* \
 		debian/control.modules debian/VERSION
 	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
 	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:
-	# Add support for a custom defconfig file in the debian directory.
-ifneq (,$(filter dpdk_config=%,$(DEB_BUILD_OPTIONS)))
-	test -e config/defconfig_$(DPDK_CONFIG) || ln -fs ../debian/defconfig_$(DPDK_CONFIG) config/defconfig_$(DPDK_CONFIG)
-endif
-	# report dpkg-buildflags status to build log
-	dpkg-buildflags --status
-	echo EXTRA_CFLAGS $$EXTRA_CFLAGS
-	echo EXTRA_LDFLAGS: $$EXTRA_LDFLAGS
-	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_STATIC_DIR) T=$(DPDK_CONFIG) config
-ifeq (,$(filter dpdk_config=%,$(DEB_BUILD_OPTIONS)))
-	sed -ri -e 's,(RTE_MACHINE=).*,\1$(RTE_MACHINE),' \
-		-e 's,(RTE_NEXT_ABI=).*,\1n,' \
-		-e 's,(CONFIG_RTE_EAL_IGB_UIO=).*,\1$(DPDK_CONFIG_BUILD_KMOD),' \
-		-e 's,(CONFIG_RTE_KNI_KMOD=).*,\1$(DPDK_CONFIG_BUILD_KMOD),' \
-		-e 's,(LIBRTE_PMD_PCAP=).*,\1y,' \
-		-e 's,(CONFIG_RTE_EAL_PMD_PATH=).*,\1"/usr/lib/$(DEB_HOST_MULTIARCH)/$(DPDK_DRIVER_DIR)/",' \
-		$(DPDK_STATIC_DIR)/.config
-ifeq (,$(filter $(DEB_HOST_ARCH), armhf))
-	sed -ri -e 's,(CONFIG_RTE_LIBRTE_MLX4_PMD=).*,\1y,' \
-		-e 's,(CONFIG_RTE_LIBRTE_MLX5_PMD=).*,\1y,' \
-		-e 's,(LIBRTE_PMD_OPENSSL=).*,\1y,' \
-		$(DPDK_STATIC_DIR)/.config
-endif
-endif
-	echo "CONFIG_RTE_MAJOR_ABI=\"$(DPDK_ABI)\"" >> \
-		$(DPDK_STATIC_DIR)/.config
-	# Intel IPSEC library is amd64-only
-ifneq (,$(filter $(DEB_HOST_ARCH), amd64))
-	sed -ri -e 's,(CONFIG_RTE_LIBRTE_PMD_AESNI_MB=).*,\1y,' \
-		-e 's,(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=).*,\1y,' \
-		$(DPDK_STATIC_DIR)/.config
-endif
-	dh_auto_configure
+	dh_auto_configure -- \
+		--includedir=include/dpdk \
+		-Dper_library_versions=false \
+		-Dinclude_subdir_arch=../$(DEB_HOST_MULTIARCH)/dpdk \
+		-Dmachine=corei7 \
+		-Dkernel_dir=$(KSRC) \
+		-Denable_kmods=$(DPDK_CONFIG_BUILD_KMOD)
 
 override_dh_auto_build-indep:
 ifeq (y,$(BUILD_DOCS))
-	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_STATIC_DIR) doc-api-html doc-guides-html
+	dh_auto_build -- doc
+	# NINJA DOC INSTALL DOES NOT WORK - .buildinfo present, css missing
+	rm -f obj-$(DEB_HOST_MULTIARCH)/doc/guides/guides/.buildinfo
 endif
 
+# ninja install doc does not work, will rebuild everything,
+# only dpdk-doc as arch: all so just skip it
 override_dh_auto_install-indep:
-	# Package: dpdk-doc
-	# All files based on the install-doc rule (includes examples)
-ifeq (y,$(BUILD_DOCS))
-	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_STATIC_DIR) prefix=/usr \
-		DESTDIR=debian/dpdk-doc install-doc
-endif
-
-override_dh_auto_build-arch:
-ifeq (y,$(BUILD_STATIC_LIB))
-	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_STATIC_DIR) RTE_KERNELDIR=$(KSRC) build
-endif
-	# Unfortunately the decision about having static or shared libraries is
-	# made for the whole build, which then produces only .a or .so files
-	# (but not both).
-	# And the target layout for target selection has no field for the
-	# type of library.
-	# Right now I hack this by doing a second build which only differs in
-	# the selection of shared libs.
-	# Shared libs should be default, so the previous static build is only
-	# used to get static libraries.
-	cp -a $(DPDK_STATIC_DIR) $(DPDK_SHARED_DIR)
-	sed -ri 's,(RTE_BUILD_SHARED_LIB=).*,\1y,' \
-		$(DPDK_SHARED_DIR)/.config
-	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) RTE_KERNELDIR=$(KSRC) build
-ifeq (y,$(BUILD_DOCS))
-	# need to be around for dh_installman to be picked up
-	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) RTE_KERNELDIR=$(KSRC) doc-guides-man
-endif
-	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) RTE_KERNELDIR=$(KSRC) test-build
 
-override_dh_auto_install-arch: LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 override_dh_auto_install-arch:
-	# Package: dpdk (runtime)
-ifeq (y,$(BUILD_STATIC_LIB))
-	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_STATIC_DIR) prefix=/usr libdir=$(LIBDIR) \
-		DESTDIR=debian/dpdk install-runtime
-endif
-	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) prefix=/usr libdir=$(LIBDIR) \
-		DESTDIR=debian/dpdk install-runtime
-	mkdir -p debian/dpdk/etc/dpdk
-	cp debian/dpdk.interfaces debian/dpdk/etc/dpdk/interfaces
-	rm debian/dpdk/usr/sbin/dpdk-devbind
-	mkdir -p debian/dpdk/sbin
-	ln -s /usr/share/dpdk/usertools/dpdk-devbind.py \
-		debian/dpdk/sbin/dpdk-devbind
-	# Package: dpdk-dev (build environment)
-	# workaround to fix symbolic link creation
-	mkdir -p debian/dpdk-dev/$(LIBDIR)
-	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) prefix=/usr libdir=$(LIBDIR) \
-		DESTDIR=debian/dpdk-dev install-sdk
-	# remove workaround
-	rm -fr debian/dpdk-dev/usr/lib
-	cp $(DPDK_SHARED_DIR)/.config debian/dpdk-dev/usr/share/dpdk/config
-	sed -e 's/SDK_TARGET/$(RTE_TARGET)/' debian/dpdk-sdk-env.sh.in > \
-		debian/dpdk-dev/usr/share/dpdk/dpdk-sdk-env.sh
-	# include the bundled autotest suite to be usable from the dpdk-dev package
-	if grep -qs 'CONFIG_RTE_APP_TEST=y' $(DPDK_SHARED_DIR)/.config; then \
-		mkdir -p debian/dpdk-dev/usr/share/dpdk/test; \
-		cp -a test/test/autotest* debian/dpdk-dev/usr/share/dpdk/test; \
-		cp $(DPDK_SHARED_DIR)/app/test debian/dpdk-dev/usr/share/dpdk/test/; \
-		cp $(DPDK_SHARED_DIR)/app/testacl debian/dpdk-dev/usr/share/dpdk/test/; \
-		cp $(DPDK_SHARED_DIR)/app/testpipeline debian/dpdk-dev/usr/share/dpdk/test/; \
-	fi
-	# since we move libs to multiarch dirs update the non aware symlink
-	rm debian/dpdk-dev/usr/share/dpdk/$(RTE_TARGET)/lib
-	ln -rs debian/dpdk-dev/$(LIBDIR)/ \
-		debian/dpdk-dev/usr/share/dpdk/$(RTE_TARGET)/lib
-	# Package: libdpdk-dev (bare headers, static devel libs and linker
-	# script)
-	mkdir -p debian/libdpdk-dev/$(LIBDIR)
-	# linker script
-	mv debian/dpdk/$(LIBDIR)/libdpdk.so debian/libdpdk-dev/$(LIBDIR)/
-	# includes
-	# Some headers have architecture-specific content, but the upstream build
-	# system installs them in the same directory, breaking multiarch.
-	# Move them in /usr/include/<arch>/dpdk instead.
-	mkdir -p debian/libdpdk-dev/usr/include/$(DEB_HOST_MULTIARCH)/dpdk
-	# Before moving the files, remove the symlink in usr/share/dpdk and copy them over,
-	# as the SDK subdir is architecture specific and requires the arch-specific headers
-	# in the top level
-	rm -f debian/dpdk-dev/usr/share/dpdk/$(RTE_TARGET)/include
-	mkdir -p debian/dpdk-dev/usr/share/dpdk/$(RTE_TARGET)/include
-	cp -r debian/dpdk-dev/usr/include/dpdk/* debian/dpdk-dev/usr/share/dpdk/$(RTE_TARGET)/include
-	# genereate the preinst to deal with the symlink -> directory transition smoothly
+	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
-	mv $(addprefix debian/dpdk-dev/usr/include/dpdk/,$(notdir $(wildcard lib/librte_eal/common/include/arch/$(INCLUDE_ARCH)/*.h))) \
-		debian/libdpdk-dev/usr/include/$(DEB_HOST_MULTIARCH)/dpdk/
-	mv debian/dpdk-dev/usr/include/dpdk/rte_config.h \
-		debian/libdpdk-dev/usr/include/$(DEB_HOST_MULTIARCH)/dpdk/
-	mv debian/dpdk-dev/usr/include/dpdk debian/libdpdk-dev/usr/include/
-	rmdir debian/dpdk-dev/usr/include
-	# backward compatibility: to ease things for the majority of users,
-	# which are on x86_64, symlink the x86 headers into the global
-	# directory.
-ifeq (x86_64-linux-gnu,$(DEB_HOST_MULTIARCH))
-	ln -rs debian/libdpdk-dev/usr/include/$(DEB_HOST_MULTIARCH)/dpdk/*.h \
-		debian/libdpdk-dev/usr/include/dpdk
-endif
 	# 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
-	# all static libs are in the dev package
-ifeq (y,$(BUILD_STATIC_LIB))
-	mv debian/dpdk/$(LIBDIR)/lib*.a debian/libdpdk-dev/$(LIBDIR)/
-endif
-	# symlinks to last .so's are in the non versioned libdpdk-dev as well
-	# this allows multiple libdpdk-<NAME><VER> at different VER concurrently
-	# libdpdk-dev depends on all sublibs so symlinks are never broken
-	mv debian/dpdk/$(LIBDIR)/*.so debian/libdpdk-dev/$(LIBDIR)/
-	# Package(s): libdpdk-<NAME><VER> (bare runtime libs)
-	for lib in $$(ls -1 debian/dpdk/$(LIBDIR)/*.so.*); do \
-	  BN=$$(basename $${lib}); \
-	  LN=$$(echo $${BN} | sed -e 's/\.so\.[0-9\.]*$$//' | tr '_' '-'); \
+	# Package(s): libdpdk-<NAME><VER> (bare runtime libs and PMDs)
+	for lib in $$(ls -1 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.so.*); do \
+	  LN=$$(basename $${lib} | sed -e 's/\.so\.[0-9\.]*$$//' | tr '_' '-'); \
 	  if echo $${LN} | grep -q ".*[0-9]$$"; then \
 	    PKG=$${LN}-$(DPDK_ABI); \
 	  else \
 	    PKG=$${LN}$(DPDK_ABI); \
 	  fi; \
 	  LIBF="$$(basename $${lib})"; \
-	  LIBD="debian/$${PKG}/$(LIBDIR)"; \
-	  echo "moving $${lib} to dir $${LIBD} (PKG=$${PKG} BN=$${BN} LN={$${LN} LIBF=$${LIBF} LIBD=$${LIBD})"; \
-	  mkdir -p $${LIBD}; \
-	  mv $${lib} $${LIBD}; \
-	  if [ "$${LIBF#librte_pmd_}x" != "$${LIBF}x" ]; then \
-	    mkdir -p $${LIBD}/$(DPDK_DRIVER_DIR); \
-	    echo "PMD: linking $${LIBF} into RTE_EAL_PMD_PATH at $${LIBD}/$(DPDK_DRIVER_DIR)/"; \
-	    ln -s --relative --target-directory=$${LIBD}/$(DPDK_DRIVER_DIR)/ $${LIBD}/$${LIBF}; \
-	  fi; \
-	  if [ "$${LIBF#librte_mempool_}x" != "$${LIBF}x" ]; then \
-	    mkdir -p $${LIBD}/$(DPDK_DRIVER_DIR); \
-	    echo "MEMPOOL: linking $${LIBF} into RTE_EAL_PMD_PATH at $${LIBD}/$(DPDK_DRIVER_DIR)/"; \
-	    ln -s --relative --target-directory=$${LIBD}/$(DPDK_DRIVER_DIR)/ $${LIBD}/$${LIBF}; \
-	  fi; \
-	  if [ "$${LIBF#librte_ifcvf_}x" != "$${LIBF}x" ]; then \
-	    mkdir -p $${LIBD}/$(DPDK_DRIVER_DIR); \
-	    echo "IFCVF: linking $${LIBF} into RTE_EAL_PMD_PATH at $${LIBD}/$(DPDK_DRIVER_DIR)/"; \
-	    ln -s --relative --target-directory=$${LIBD}/$(DPDK_DRIVER_DIR)/ $${LIBD}/$${LIBF}; \
-	  fi; \
-	  if [ "$${LIBF#librte_eal}x" != "$${LIBF}x" ]; then \
-	    mkdir -p $${LIBD}/$(DPDK_DRIVER_DIR); \
+	  dh_install -p $${PKG} usr/lib/$(DEB_HOST_MULTIARCH)/$${LIBF}; \
+	  if [ -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*/*/$${LIBF} ]; then \
+	    dh_install -p $${PKG} usr/lib/$(DEB_HOST_MULTIARCH)/*/*/$${LIBF}; \
 	  fi; \
 	done
-	# pkg-config
-	mkdir -p debian/libdpdk-dev/$(LIBDIR)/pkgconfig
-	LIBS=$$(sed -e 's/GROUP ( \(.*\) )/\1/' -e 's/lib/-l/g' -e 's/\.so//g' \
-		$(CURDIR)/debian/libdpdk-dev/$(LIBDIR)/libdpdk.so); \
-	sed -e "s/@DPDK_LIBS@/$${LIBS}/" -e "s/@VERSION@/$(DEB_VERSION_UPSTREAM)/" \
-		-e "s|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g" \
-		debian/libdpdk.pc.in > debian/libdpdk-dev/$(LIBDIR)/pkgconfig/libdpdk.pc
 	# Package: dpdk-igb-uio-dkms
-	mkdir -p debian/dpdk-igb-uio-dkms/usr/src/dpdk-igb-uio-$(DEB_VERSION_UPSTREAM)
-	cp kernel/linux/igb_uio/* \
-		debian/dpdk-igb-uio-dkms/usr/src/dpdk-igb-uio-$(DEB_VERSION_UPSTREAM)
+	dh_install -p dpdk-igb-uio-dkms kernel/linux/igb_uio/* \
+		usr/src/dpdk-igb-uio-$(DEB_VERSION_UPSTREAM)
 	# Package: dpdk-rte-kni-dkms
-	mkdir -p debian/dpdk-rte-kni-dkms/usr/src/dpdk-rte-kni-$(DEB_VERSION_UPSTREAM)
-	cp -a kernel/linux/kni/* \
-		debian/dpdk-rte-kni-dkms/usr/src/dpdk-rte-kni-$(DEB_VERSION_UPSTREAM)
+	dh_install -p dpdk-rte-kni-dkms kernel/linux/kni/* \
+		usr/src/dpdk-rte-kni-$(DEB_VERSION_UPSTREAM)
 ifneq (,$(KVERS))
 	# Package: dpdk-modules-<kernel version>
-	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) \
-		kerneldir=/lib/modules/$(KVERS)/extra/dpdk \
-		DESTDIR=debian/dpdk-modules-$(KVERS) install-kmod
+	dh_install -p dpdk-modules-$(KVERS) lib/modules
 endif
 
 override_dh_dkms: