From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 4AB71A0096 for ; Wed, 10 Apr 2019 18:45:01 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 333C81B128; Wed, 10 Apr 2019 18:45:01 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 616391B1E9 for ; Wed, 10 Apr 2019 18:44:58 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CA00BDBD9C; Wed, 10 Apr 2019 16:44:57 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-94.ams2.redhat.com [10.36.117.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id D63195D961; Wed, 10 Apr 2019 16:44:56 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: dpdk stable Date: Wed, 10 Apr 2019 17:43:35 +0100 Message-Id: <20190410164411.10546-27-ktraynor@redhat.com> In-Reply-To: <20190410164411.10546-1-ktraynor@redhat.com> References: <20190410164411.10546-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 10 Apr 2019 16:44:57 +0000 (UTC) Subject: [dpdk-stable] patch 'examples/ip_pipeline: disable build when no epoll' has been queued to LTS release 18.11.2 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 LTS release 18.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/16/19. 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. Kevin Traynor --- >From 8928f449290dc19e169bbc2f6f94117f465499eb Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Mon, 25 Feb 2019 15:23:03 +0000 Subject: [PATCH] examples/ip_pipeline: disable build when no epoll [ upstream commit 0c56257a61ec272926c2560b60d078ba266f8564 ] The ip_pipeline example requires the epoll.h header from linux, so disable building the example if the header cannot be found. Fixes: 4bbf8e30aa5e ("examples/ip_pipeline: add CLI interface") Signed-off-by: Bruce Richardson --- examples/ip_pipeline/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/ip_pipeline/meson.build b/examples/ip_pipeline/meson.build index 5e5fe6479..664223c97 100644 --- a/examples/ip_pipeline/meson.build +++ b/examples/ip_pipeline/meson.build @@ -7,4 +7,5 @@ # DPDK instance, use 'make' +build = cc.has_header('sys/epoll.h') deps += ['pipeline', 'bus_pci'] allow_experimental_apis = true -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-10 14:06:10.015767778 +0100 +++ 0027-examples-ip_pipeline-disable-build-when-no-epoll.patch 2019-04-10 14:06:07.845294678 +0100 @@ -1,13 +1,14 @@ -From 0c56257a61ec272926c2560b60d078ba266f8564 Mon Sep 17 00:00:00 2001 +From 8928f449290dc19e169bbc2f6f94117f465499eb Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Mon, 25 Feb 2019 15:23:03 +0000 Subject: [PATCH] examples/ip_pipeline: disable build when no epoll +[ upstream commit 0c56257a61ec272926c2560b60d078ba266f8564 ] + The ip_pipeline example requires the epoll.h header from linux, so disable building the example if the header cannot be found. Fixes: 4bbf8e30aa5e ("examples/ip_pipeline: add CLI interface") -Cc: stable@dpdk.org Signed-off-by: Bruce Richardson ---