From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 56C3AA0093 for ; Tue, 19 May 2020 15:00:08 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4F8351D60D; Tue, 19 May 2020 15:00:08 +0200 (CEST) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id EDDA01C239 for ; Tue, 19 May 2020 15:00:06 +0200 (CEST) Received: by mail-wm1-f68.google.com with SMTP id z72so3460724wmc.2 for ; Tue, 19 May 2020 06:00:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DEWBIfXGNrHCIocUFfZcIZRNgyyEEo8szVRgq4wJg3o=; b=VXXL8XoFhMVQRjdDwI2xMMPQakCVLtcTlhZDVzo44LYrzV4q47cwVaSyI3jMyb/M2o TtwlVW/RTeAPSDKXWugk2c5MLqYY96jo0JJJc3sfqJ5aVxmmRzF4ll3xMc8jW1QxTVoM bVLKfg4JjAvd8MoIGs7/2MLddrGi+Y0WrsRuFgAk8WEmf6KHkBa5lkDz5nXcXQURmAMn elu1jpWAMg+BQxia1OvqFYaRmtjAA/Sz0PJ9WS/0TlpsbIWLww0wpLIT1C/zb84hfhg2 iKTr5pBIOncrvids/UTt2v/iR/n2BgOSl1FUmBpY8uP3My8HoBMrGNdMFielMmfZYNyJ TiYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DEWBIfXGNrHCIocUFfZcIZRNgyyEEo8szVRgq4wJg3o=; b=cKLAjsjwV7ef3nmZe97Zxwb3LNXoVNNIf5l6IJljIeO9OFwB3QxVOBCnXRdwTIlTaV GlmGXeEIb1uMXAdOUXpAXQTwmcXyR3+CSvQ0Gb5wskqgEMpe1nAw75QxXSvkuBCsJ10p Ww88jWdtqkq36+1eOlLIrolI48JW8je2kpQxM2PiCEGoyvIz/VbWoe4Sg7SAOoHroluA lFW5cZ2qdI55FHrgTshU53fI5jfnnE1G9fkpBveKH9fRR2FsodrY8+BgCmKW5xnZk5rN ISZC1V6pJbYIvihYg6cK5kMgqX6FKxYSdyVvYV7tF0MXMiisZfCn8bJOHo/hrXrEfcvF 3IlQ== X-Gm-Message-State: AOAM533wrW8Qi8VnaEewipC13j7L1P8wV6JYiKO46RfUrhgDYq/B9Qmq 9sXE/6wJVse38Ipy9gPNDjg= X-Google-Smtp-Source: ABdhPJwrE9fGluBU8qj3PA+XhvtfdAEw1Nye/OxOKPV7qjy1Bs0s7/7Een5DUdRI/ZzYV6wxgQd3Wg== X-Received: by 2002:a1c:c309:: with SMTP id t9mr5212023wmf.113.1589893206426; Tue, 19 May 2020 06:00:06 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id h1sm4046526wme.42.2020.05.19.06.00.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:00:05 -0700 (PDT) From: luca.boccassi@gmail.com To: =?UTF-8?q?Juraj=20Linke=C5=A1?= Cc: Aaron Conole , Ruifeng Wang , dpdk stable Date: Tue, 19 May 2020 13:54:08 +0100 Message-Id: <20200519125804.104349-58-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519125804.104349-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'ci: fix telemetry dependency in Travis' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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?= 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š Acked-by: Aaron Conole Reviewed-by: Ruifeng Wang --- .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?= 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@dpdk.org Signed-off-by: Juraj Linkeš Acked-by: Aaron Conole @@ -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