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 4120EA0093 for ; Tue, 19 May 2020 15:07:52 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 36B871D603; Tue, 19 May 2020 15:07:52 +0200 (CEST) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 919701D672 for ; Tue, 19 May 2020 15:07:50 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id z72so3496785wmc.2 for ; Tue, 19 May 2020 06:07:50 -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=mouzNHLSGzK6OUNBVBd7W2LS3887C8Cab7bz4uNgBOU=; b=JgBph103u+kZxk7tBemnXs6pegNUIV9iLp7xnvoewiQhSqtujPli3PEcL5UqvKeaHp ThRWYJtyo1/YEXUD2dJLvK+HYZDqZokkrLnDpbwc8cGrTD/kqnsyrygdxNoelZu1HjQH ea/ozHQiEmGst4JMTVLcVS7Hyw88wchfIGLY5DZMAOYCDs7/VAYsEbiGIypl+R+qjCtf jW9dvtwP+24O48EZiXMDcJqxSgbOtkyJ/7cSO9JNqep8xAiGmtzWKWqPupo393EARaHc t25yYt63eBcLFifSNs0ZqpN9vCZ3rmWWjfIPIUUTjGIOmRTPRNUmF7C8iOL9enl5bKO+ 7Umw== 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=mouzNHLSGzK6OUNBVBd7W2LS3887C8Cab7bz4uNgBOU=; b=uVWrLTZzxNO5l37JRCPCO69Q+KRRTM5NC3/ZplAOxOJxYITVrOkDk087YM5dZx9j1M Zm412lFeiRBiRUVYhXEXt/B3npB0zgusdZQLSyR739PC95xlea8UYn6YC2eh/3jn64iP Q+0Ll6XNDT7TB30vaQrnpJFGuORlHJs1gMLimIBcfXo1h81wYeyNqk4heZDsB1jll6sF wlw69WCRu2mOM0BUotl3l0zTgqOEqDT8MUUMD6Sb6gvWHn8uW9+EYaT02K5E44VhAdMO rjOzTn8zkQuyTCINopMlPruzAqcghnrQuqzXV8IDpPYdLRO1f56IIBIxXd55owKFeF2d kh0A== X-Gm-Message-State: AOAM533mi5n3K30sMdDH2QSc9sghRfc951ejG1hMZ3OFJxxc2tZbIOoi 2Go+HzWGOZRDAFmEF6O6jxc= X-Google-Smtp-Source: ABdhPJwLYxfJVYdPWyYl5wb478kda36ablIY7qqN1q8wsgkHLQaIs9YlOzJf3uM7BobkEPL3RV/eAg== X-Received: by 2002:a05:600c:2197:: with SMTP id e23mr5498079wme.162.1589893670277; Tue, 19 May 2020 06:07:50 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id g187sm3883379wmf.30.2020.05.19.06.07.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:07:49 -0700 (PDT) From: luca.boccassi@gmail.com To: Amit Gupta Cc: Bruce Richardson , Harman Kalra , dpdk stable Date: Tue, 19 May 2020 14:02:52 +0100 Message-Id: <20200519130549.112823-37-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/octeontx: fix meson build for disabled drivers' 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 272fcab0633393e8f7fa608c3046aa98ad73c9a4 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 @@ -10,7 +10,10 @@ sources = [ 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 c_args = cflags -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:46.086685211 +0100 +++ 0037-net-octeontx-fix-meson-build-for-disabled-drivers.patch 2020-05-19 14:04:44.172647575 +0100 @@ -1,15 +1,16 @@ -From be284df0829254f5b84bb965acbecef0aa2ae043 Mon Sep 17 00:00:00 2001 +From 272fcab0633393e8f7fa608c3046aa98ad73c9a4 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") -Cc: stable@dpdk.org Signed-off-by: Amit Gupta Reviewed-by: Bruce Richardson @@ -19,7 +20,7 @@ 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/octeontx/base/meson.build b/drivers/net/octeontx/base/meson.build -index b72104170e..b8fe4b3013 100644 +index a06a2c89c9..e1060fc4ec 100644 --- a/drivers/net/octeontx/base/meson.build +++ b/drivers/net/octeontx/base/meson.build @@ -10,7 +10,10 @@ sources = [