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 1575AA0093 for ; Thu, 28 May 2020 18:25:33 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0D9BE1DC19; Thu, 28 May 2020 18:25:33 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 283BC1DC19 for ; Thu, 28 May 2020 18:25:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3HmLsUS5XBVJlTSgO6FKa0MK45QDRKNDwtVW0L4W1X0=; b=WVV91dCrk3s1GwieXeHDFkoP7aiAzciBVtYBOsye7OC36tHwrL91EnvOgFiGnsCehFZNdn JnVcYLHGoshPUk20yCZxAlnTx4BqnyNOgYmjIE6M4knj9jJ1hhZdNQPhYoYaD5SKpdzDa3 vOLQ9eHXGehM4uKme4sn+4pxCxr4sMw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-49-HOZXrxb5OUWF3tcL61c0RQ-1; Thu, 28 May 2020 12:25:28 -0400 X-MC-Unique: HOZXrxb5OUWF3tcL61c0RQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B131A1054F8F; Thu, 28 May 2020 16:25:26 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id A21EC60C05; Thu, 28 May 2020 16:25:25 +0000 (UTC) From: Kevin Traynor To: Amit Gupta Cc: Bruce Richardson , Harman Kalra , dpdk stable Date: Thu, 28 May 2020 17:22:40 +0100 Message-Id: <20200528162322.7863-53-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/octeontx: fix meson build for disabled drivers' has been queued to LTS release 18.11.9 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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/03/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/7610bf2a8240a892461a4b9f3c6a112436696aa1 Thanks. Kevin. --- >From 7610bf2a8240a892461a4b9f3c6a112436696aa1 Mon Sep 17 00:00:00 2001 From: Amit Gupta Date: Wed, 4 Mar 2020 11:17:04 +0530 Subject: [PATCH] net/octeontx: fix meson build for disabled drivers [ upstream commit be284df0829254f5b84bb965acbecef0aa2ae043 ] Add a condition to check if octeontx drivers are disabled. octeontx drivers are built only if dependent drivers i.e. ethdev, mempool and common/octeontx are enabled. Bugzilla ID: 387 Fixes: 7f615033d64f ("drivers/net: build Cavium NIC PMDs with meson") Signed-off-by: Amit Gupta Reviewed-by: Bruce Richardson Acked-by: Harman Kalra --- drivers/net/octeontx/base/meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/octeontx/base/meson.build b/drivers/net/octeontx/base/meson.build index a06a2c89c9..e1060fc4ec 100644 --- a/drivers/net/octeontx/base/meson.build +++ b/drivers/net/octeontx/base/meson.build @@ -11,5 +11,8 @@ depends = ['ethdev', 'mempool_octeontx'] static_objs = [] foreach d: depends - static_objs += [get_variable('static_rte_' + d)] + if not is_variable('shared_rte_' + d) + subdir_done() + endif + static_objs += get_variable('static_rte_' + d) endforeach -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:01.870722255 +0100 +++ 0053-net-octeontx-fix-meson-build-for-disabled-drivers.patch 2020-05-28 17:12:59.126555835 +0100 @@ -1 +1 @@ -From be284df0829254f5b84bb965acbecef0aa2ae043 Mon Sep 17 00:00:00 2001 +From 7610bf2a8240a892461a4b9f3c6a112436696aa1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit be284df0829254f5b84bb965acbecef0aa2ae043 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index b72104170e..b8fe4b3013 100644 +index a06a2c89c9..e1060fc4ec 100644