Merge ~paelzer/ubuntu/+source/dpdk:19.11-Focal-early into ubuntu/+source/dpdk:debian/experimental

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

This is the bump from 18.11.5-1 currently in Focal to 19.11-2.
Debian has no FF ahead, so there we will wait for a final OVS 2.13 release - that timing woudln't work for Ubuntu 20.04
Also due to bug 1836708 still waiting on the kernel Team it can't be a sync (not even from experimental), but it needs to be in Focal before Openvswitch lands.

James is working on OVN/Openvswitch 2.13 here https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3694/+packages

I was test building DPDK here https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3881/+packages

There aren't that many tests that we can do before OVS is complete (the few I can completed like l2fwd and testpmd), but once we have that we will have to upload DPDK first. Therefore I opened this MP.

To some extend you can consider the all but the last few changes peer reviewed already as I do those with Luca in Debian. The only "new" content is the disabling of libbpd-dev build dependency for now until the kernel team got to it. Then it will be a sync.

[Christian Ehrhardt  (paelzer)]

I resubmitted this MP against a different merge target, this way it looks much smaller (as small as I outlined before already).

[Christian Ehrhardt  (paelzer)]

librte-pmd-af-xdp20.0_19.11-2ubuntu1~ppa1_amd64.deb is actually the one that goes empty.
Dropping that one as well

[Luca Boccassi (bluca)]

review: Approve

bc7c5dc... by Christian Ehrhardt  on 2020-01-09

d/control: remove librte-pmd-af-xdp20.0 until libbpf-dev is available

Signed-off-by: Christian Ehrhardt <email address hidden>

d4c4153... by Christian Ehrhardt  on 2020-01-09

changelog: remove librte-pmd-af-xdp20.0 until libbpf-dev is available

Signed-off-by: Christian Ehrhardt <email address hidden>

[Christian Ehrhardt  (paelzer)]

tag pushed and uploaded to focal

[Christian Ehrhardt  (paelzer)]

This is in focal-release -> merged

diff --git a/debian/changelog b/debian/changelog
index 14be6f1..c77762f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+dpdk (19.11-2ubuntu1) focal; urgency=medium
+
+  * Upload 19.11 to Focal
+    - d/control: disable libbpf-dev build dependency while waiting for the
+      kernel to build it for LP: 1836708 1826410.
+    - d/control: remove librte-pmd-af-xdp20.0 until libbpf-dev is available
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 06 Jan 2020 12:07:45 +0100
+
 dpdk (19.11-2) experimental; urgency=medium
 
   * dh-missing: ignore examples directory, as they are already installed
diff --git a/debian/control b/debian/control
index 5dba511..88e4ce1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
 Source: dpdk
 Priority: optional
-Maintainer: Debian DPDK Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian DPDK Maintainers <[e-mail]>
 Uploaders: Luca Boccassi <[e-mail]>,
            Christian Ehrhardt <[e-mail]>,
            Santiago Ruano Rincón <[e-mail]>,
@@ -10,7 +11,6 @@ Build-Depends: debhelper (>= 10.3~),
                doxygen <!nodoc>,
                graphviz <!nodoc>,
                inkscape <!nodoc>,
-               libbpf-dev,
                libbsd-dev,
                libelf-dev,
                libfdt-dev,
@@ -128,8 +128,7 @@ Section: libdevel
 Architecture: amd64 arm64 armhf i386 ppc64el
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
-Depends: libbpf-dev,
-         libbsd-dev,
+Depends: libbsd-dev,
          libibverbs-dev,
          libipsec-mb-dev [amd64],
          libisal-dev [amd64],
@@ -2072,23 +2071,6 @@ Description: Data Plane Development Kit (librte-pmd-hns3 runtime library)
  inbuilt Hisilicon Network Subsystem(HNS) network engine found in the
  Hisilicon Kunpeng 920 SoC
 
-Package: librte-pmd-af-xdp20.0
-Architecture: amd64 arm64 armhf i386 ppc64el
-Multi-Arch: same
-Homepage: https://doc.dpdk.org/guides/nics/af_xdp.html
-Pre-Depends: ${misc:Pre-Depends},
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Conflicts: libdpdk0,
-Description: Data Plane Development Kit (librte-pmd-af-xdp 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_af-xdp.
- AF_XDP is an address family that is optimized for high performance packet
- processing. AF_XDP sockets enable the possibility for XDP program to redirect
- packets to a memory buffer in userspace.
-
 Package: librte-pmd-isal20.0
 Architecture: amd64
 Multi-Arch: same