[dpdk-stable] patch 'ci: fix telemetry dependency in Travis' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 1c51807a3550406f134f79c1f2a4b6d2c72e69b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juraj=20Linke=C5=A1?= <juraj.linkes at pantheon.tech>
Date: Fri, 3 Apr 2020 14:45:49 +0200
Subject: [PATCH] ci: fix telemetry dependency in Travis
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 254e11c66a53d13d0ffd78af54091a1a9b748f6b ]

libjansson4 is not enough to build telemetry. Replace it with
libjansson-dev.

Fixes: 99889bd85228 ("ci: introduce Travis builds for GitHub repositories")

Signed-off-by: Juraj Linkeš <juraj.linkes at pantheon.tech>
Acked-by: Aaron Conole <aconole at redhat.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang at arm.com>
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0bb47c191e..77ac26dd85 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ _aarch64_packages: &aarch64_packages
 
 _extra_packages: &extra_packages
   - *required_packages
-  - [libbsd-dev, libpcap-dev, libcrypto++-dev, libjansson4]
+  - [libbsd-dev, libpcap-dev, libcrypto++-dev, libjansson-dev]
 
 _build_32b_packages: &build_32b_packages
   - *required_packages
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 13:56:21.201697438 +0100
+++ 0058-ci-fix-telemetry-dependency-in-Travis.patch	2020-05-19 13:56:18.287503043 +0100
@@ -1,4 +1,4 @@
-From 254e11c66a53d13d0ffd78af54091a1a9b748f6b Mon Sep 17 00:00:00 2001
+From 1c51807a3550406f134f79c1f2a4b6d2c72e69b8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Juraj=20Linke=C5=A1?= <juraj.linkes at pantheon.tech>
 Date: Fri, 3 Apr 2020 14:45:49 +0200
 Subject: [PATCH] ci: fix telemetry dependency in Travis
@@ -6,11 +6,12 @@
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+[ upstream commit 254e11c66a53d13d0ffd78af54091a1a9b748f6b ]
+
 libjansson4 is not enough to build telemetry. Replace it with
 libjansson-dev.
 
 Fixes: 99889bd85228 ("ci: introduce Travis builds for GitHub repositories")
-Cc: stable at dpdk.org
 
 Signed-off-by: Juraj Linkeš <juraj.linkes at pantheon.tech>
 Acked-by: Aaron Conole <aconole at redhat.com>
@@ -20,17 +21,17 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/.travis.yml b/.travis.yml
-index fd4f79cfc6..2d2292ff64 100644
+index 0bb47c191e..77ac26dd85 100644
 --- a/.travis.yml
 +++ b/.travis.yml
-@@ -15,7 +15,7 @@ addons:
-     update: true
-     packages: &required_packages
-       - [libnuma-dev, python3-setuptools, python3-wheel, python3-pip, ninja-build]
--      - [libbsd-dev, libpcap-dev, libibverbs-dev, libcrypto++-dev, libfdt-dev, libjansson4]
-+      - [libbsd-dev, libpcap-dev, libibverbs-dev, libcrypto++-dev, libfdt-dev, libjansson-dev]
+@@ -21,7 +21,7 @@ _aarch64_packages: &aarch64_packages
+ 
+ _extra_packages: &extra_packages
+   - *required_packages
+-  - [libbsd-dev, libpcap-dev, libcrypto++-dev, libjansson4]
++  - [libbsd-dev, libpcap-dev, libcrypto++-dev, libjansson-dev]
  
- _aarch64_packages: &aarch64_packages
+ _build_32b_packages: &build_32b_packages
    - *required_packages
 -- 
 2.20.1