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 CD7DAA04DD for ; Wed, 28 Oct 2020 11:56:55 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C6C5FCAFC; Wed, 28 Oct 2020 11:56:54 +0100 (CET) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by dpdk.org (Postfix) with ESMTP id B8E0ACAE0 for ; Wed, 28 Oct 2020 11:56:53 +0100 (CET) Received: by mail-wm1-f46.google.com with SMTP id c194so4103917wme.2 for ; Wed, 28 Oct 2020 03:56:53 -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=VjEHD5EzZZ5yITMx3SDF0hDcvWQofYcE2Tc9hfmTmR0=; b=We2ksPW6sqJ+itoxf30TL64bQta3pwY3+lItbZQmxagqFD4v012E8S2ACvtuhM2/M3 MoZyMs2UXReFT6REhU70pJwg8AlUCs1KiKOAjyosz2ff+fYHrpikXwT9/GmkcAR7dGE0 sWBx0GnDxfWiyqwVrg6CZDYVgbILQjNmPb9zYyTFO6RQ41hyM38J+7GhLSn3WzRu59ol HMQqAT44PtjfkDGgIsowfEy6AyFTSGxnqy0TSXjFyErAp967gAd4Fb5fKRwRyXGablum V3/Abb+Tw2T4+oktApDQmQ/1e5kYe1hPJdVZMfS9UbGNYK0V6OwYbJcTP3LxnW26Hequ 3THA== 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=VjEHD5EzZZ5yITMx3SDF0hDcvWQofYcE2Tc9hfmTmR0=; b=MPDMdn8gWp1AslWZadaca7fkxwT/fhTExyeXQ7TBfJ9GGFzbMbKswsgMqGv7iSQcFR Ya+BjF6XVpvwvQwbuS+XDdhWq3kbqEMsQ4cuDuO+mzzET5j0Qo4YMFLLvK0JHzx+pnyp U4Xh5LNmh+f5lNqoDKl4jO3920hKXTgV2zkO8w8F8uXXS4NAVhoyAl6xDKUhj7QwcMYG i+4t0ETE1i0eF3fxqcJWPi8c7Fb1OkZpOwugFrX+q5l1SXXz5b4mRhSocSe2oh8Ri4U+ UXNQAke1s+GgOKuqUCA/28BJkdCrk76YYouZdCu8iRjhvwh2IQ/zM+Xvhq8YrsaznZux av2w== X-Gm-Message-State: AOAM533+p1Vc11kcWo72XHguvnlD8W0h8Rw+uo4qvnY5+RfGjLbo24wR nML/TeaifaOlIv8zQ2Xg5tADATkDPd1GYSX8 X-Google-Smtp-Source: ABdhPJyb0soPNBv5P08qpgP9iSYAmhVRx1KOopIQxyaa+j4vql9y4cu55YoiEj9dL0jzvuxOW8+9uA== X-Received: by 2002:a05:600c:cb:: with SMTP id u11mr7192412wmm.112.1603882612322; Wed, 28 Oct 2020 03:56:52 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id q5sm6838194wrs.54.2020.10.28.03.56.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:56:51 -0700 (PDT) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Luca Boccassi , dpdk stable Date: Wed, 28 Oct 2020 10:46:00 +0000 Message-Id: <20201028104606.3504127-201-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app: fix missing dependencies' has been queued to stable release 19.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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 93d49d3ce1a43a87f600228e5d66d3f391cb4051 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 15 Oct 2020 16:05:47 +0100 Subject: [PATCH] app: fix missing dependencies [ upstream commit fac83b3ef8accd5f0f4da5b9a60d047e448281f8 ] A number of lib and driver dependencies for various apps were missed on build because the proper macro names for their use were mismatched between meson and make build systems. Before adding in equivalent compatibility macros we need to ensure to add the proper dependencies to ensure a valid build. Fixes: 16ade738fd0d ("app/testpmd: build with meson") Fixes: b5dc795a8a55 ("test: build app with meson as dpdk-test") Fixes: 996ef1176111 ("app: add all remaining apps to meson build") Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- app/test-crypto-perf/meson.build | 3 +++ app/test-pmd/meson.build | 12 ++++++++++++ app/test/meson.build | 1 + 3 files changed, 16 insertions(+) diff --git a/app/test-crypto-perf/meson.build b/app/test-crypto-perf/meson.build index 0674396da8..c416091fdd 100644 --- a/app/test-crypto-perf/meson.build +++ b/app/test-crypto-perf/meson.build @@ -13,3 +13,6 @@ sources = files('cperf_ops.c', 'cperf_test_verify.c', 'main.c') deps += ['cryptodev', 'security'] +if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') + deps += 'pmd_crypto_scheduler' +endif diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build index 93235c8192..5d77314df7 100644 --- a/app/test-pmd/meson.build +++ b/app/test-pmd/meson.build @@ -31,6 +31,18 @@ endif if dpdk_conf.has('RTE_LIBRTE_PDUMP') deps += 'pdump' endif +if dpdk_conf.has('RTE_LIBRTE_BITRATESTATS') + deps += 'bitratestats' +endif +if dpdk_conf.has('RTE_LIBRTE_LATENCYSTATS') + deps += 'latencystats' +endif +if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') + deps += 'pmd_crypto_scheduler' +endif +if dpdk_conf.has('RTE_LIBRTE_BOND_PMD') + deps += 'pmd_bond' +endif if dpdk_conf.has('RTE_LIBRTE_BNXT_PMD') deps += 'pmd_bnxt' endif diff --git a/app/test/meson.build b/app/test/meson.build index 12668fa454..1fa9124c7e 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -380,6 +380,7 @@ endif if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') driver_test_names += 'cryptodev_scheduler_autotest' + test_deps += 'pmd_crypto_scheduler' endif foreach d:test_deps -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:17.916405482 +0000 +++ 0201-app-fix-missing-dependencies.patch 2020-10-28 10:35:11.808834498 +0000 @@ -1,8 +1,10 @@ -From fac83b3ef8accd5f0f4da5b9a60d047e448281f8 Mon Sep 17 00:00:00 2001 +From 93d49d3ce1a43a87f600228e5d66d3f391cb4051 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 15 Oct 2020 16:05:47 +0100 Subject: [PATCH] app: fix missing dependencies +[ upstream commit fac83b3ef8accd5f0f4da5b9a60d047e448281f8 ] + A number of lib and driver dependencies for various apps were missed on build because the proper macro names for their use were mismatched between meson and make build systems. Before adding in equivalent compatibility @@ -12,7 +14,6 @@ Fixes: 16ade738fd0d ("app/testpmd: build with meson") Fixes: b5dc795a8a55 ("test: build app with meson as dpdk-test") Fixes: 996ef1176111 ("app: add all remaining apps to meson build") -Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi @@ -23,18 +24,18 @@ 3 files changed, 16 insertions(+) diff --git a/app/test-crypto-perf/meson.build b/app/test-crypto-perf/meson.build -index f394b75ba5..4bd71510dc 100644 +index 0674396da8..c416091fdd 100644 --- a/app/test-crypto-perf/meson.build +++ b/app/test-crypto-perf/meson.build -@@ -12,3 +12,6 @@ sources = files('cperf_ops.c', +@@ -13,3 +13,6 @@ sources = files('cperf_ops.c', 'cperf_test_verify.c', 'main.c') - deps += ['cryptodev', 'net', 'security'] + deps += ['cryptodev', 'security'] +if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') + deps += 'pmd_crypto_scheduler' +endif diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build -index f52ab148f6..0d9e450494 100644 +index 93235c8192..5d77314df7 100644 --- a/app/test-pmd/meson.build +++ b/app/test-pmd/meson.build @@ -31,6 +31,18 @@ endif @@ -57,10 +58,10 @@ deps += 'pmd_bnxt' endif diff --git a/app/test/meson.build b/app/test/meson.build -index dedf29dd7f..fc90a1909f 100644 +index 12668fa454..1fa9124c7e 100644 --- a/app/test/meson.build +++ b/app/test/meson.build -@@ -415,6 +415,7 @@ endif +@@ -380,6 +380,7 @@ endif if dpdk_conf.has('RTE_LIBRTE_PMD_CRYPTO_SCHEDULER') driver_test_names += 'cryptodev_scheduler_autotest'