From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 86437A034F for ; Wed, 10 Nov 2021 07:59:10 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 80BDE4111A; Wed, 10 Nov 2021 07:59:10 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2073.outbound.protection.outlook.com [40.107.236.73]) by mails.dpdk.org (Postfix) with ESMTP id BDEFF40142 for ; Wed, 10 Nov 2021 07:59:08 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=inWMn/na1lo49LHOJWmwO6PpvMl6h1pvXJOxffZTEtdO9d4tLb4cZzbUZhLJT7ET63mnQ7bB9SLXtPu8hDUM+sEya8Ed2SyRcBzFmRJLrafvht/4H2bU0UibvzwOZiufbAYbVt8HRNMWogKaq9y2lWCWcNY8cIY0b/8f/aVTp555SlBfk4hxrpKwxgD5Bu2Ymam6UaqS5+TzXlCHvKxx51t5bXCIIg1RygKsYHWPjGTiZW/vB0Ao7gGwdQ2fitvPKf6MbLb0XK2nMQYvaZxj98SlqDuqRTVfbF9izSoO14gEdJ+x9b50wJGkSzvOUMjp7o34+4YTqo7oRwZZqUpG5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=uPn2fY98zulQCFoDjDjGsT175Syi+8otkN8RzdUMOXk=; b=e/GCfAyz/198Etf2n+gt3KWzIBz2fiw3g5rLJj0WGSc2wwFKA9VXKXnovbE1ThqT9cSvU69dE7eLi8BNS6SabzFaRNmknNpAFUpCYDtb8C4wbdqRwVoY3mroRWoRe9/7aKV+4INwNOSAApDQgUIXmSHpDPDqhMFImQodinMvvrAbKtB4s3qb/YkGK5WiZBBBjnMczBgAuXmfdNXamV8pGpWSAKIHoN2JmyqBvOw7/7AOuqFBgaCbJK4jbnGTMZLL/bb0gUB5HOv+F6xn7deZOOF6D8J+DtmhPJrNM5nYb2fw7VYY0DRyPPh0PRSFrrJaZ+R9FIvpSPQXMpQspQQVDg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uPn2fY98zulQCFoDjDjGsT175Syi+8otkN8RzdUMOXk=; b=J8FlWGK7/qpogMz++YSGoYzMqW2Z2SV4gQkpoF0vpC1/79ciLG3hSltM1vjcOEWVokryVUovptMl4L+4+9UYlSfwH4KYHqOKzXIHiz4vcQYKtE6DPwwAGwYsp2wq5po9zflVoZ/+9LBYy6lMqaDQbVRIXBoI5YGG0evATK1CBFgRf+/zLcikjgLl7cgXAJ8ALr3eeNJ2tZEXnsH0xvP+CpyXTG9J6OpKQH6Bg5WZ3I4uF7n+el6VSv/iGUtIbHpYe1fbXiuzdDgpAF1HzqAovCwMjTUDznuQdGNA8EGXehhGJT/AsO0W8QuBrGgZPX1v65+AeGwmCWVCMaPogmQZyQ== Received: from DM6PR06CA0084.namprd06.prod.outlook.com (2603:10b6:5:336::17) by BL0PR12MB2449.namprd12.prod.outlook.com (2603:10b6:207:40::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.17; Wed, 10 Nov 2021 06:59:07 +0000 Received: from DM6NAM11FT015.eop-nam11.prod.protection.outlook.com (2603:10b6:5:336:cafe::58) by DM6PR06CA0084.outlook.office365.com (2603:10b6:5:336::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:59:07 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT015.mail.protection.outlook.com (10.13.172.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:59:06 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:59:04 +0000 From: Xueming Li To: David Marchand CC: Luca Boccassi , Ferruh Yigit , dpdk stable Date: Wed, 10 Nov 2021 14:32:05 +0800 Message-ID: <20211110063216.2744012-242-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 98a6697e-f216-4973-a371-08d9a41796ac X-MS-TrafficTypeDiagnostic: BL0PR12MB2449: X-Microsoft-Antispam-PRVS: X-MS-Exchange-Transport-Forked: True X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eDbcFuHwTglm5c+EkOHEntF53ZezYBY2Gg6GdpqLM3IEFZoqHgEX0K9RQ8/R5Yn71wl262SddlLK4YR1UUelzG3UJKTh9DfT/7rrNZwUmmpQdDSNWGWjKIfRIif/rpkOMH0f1F99Adgof1cZUU2sjl+t1fS1+s9yMjuuWOdaVEn9Ka1HWbktJzl67layN80RKsqjCntcIKB9bJSy19Or5zmhdlZO8PhQJnN8+em7/qFTcSsAoYUwpbqWVMfiq+SdskiEPnxXec9hfSfeSGyUlfQ7coKNR/0+K9cFl7rpjnYYxpaBDS3nKSoVENvk/5O+74Daw1aIrhBj7O3Mgo2xnW6SfHju3cbzMik0tgmMmC0jmIHqPlUXMhRVFQLxOfBQDWj3To0Nr8a19Gr95B+ECLg06eOCHlnxomsockoHotXKXeGzVDDLvujqW0IjjAfITzuJTXG4Oc+seMgKmKQsq/JedsqM8fq28NVfRkLwDrxAayEx60qET/Pz0XhJyNaiEi6uQeZ0AaCzx53MgnplDQ00ERzgw5RefQX+RImYMAU8gjm7tVBjP9yj8msQDyZs3/WWeSEUs2tA1lpcXJBtGnmZaWCNsh909ad6vBQDFf7bYW23B+5yZXCJvqJ000uSTzMKev87XnALNLoq0as+fRpYfbHMjuxtoaBknSKjbWyYrJifa/CKUvetyMvWco7IKqKXjnBjOSO7xcxhMTKtNappYQLm824ZV5b8c8F9AW7xIccDCuaH5GKS5jr77nSazu4SWrxYRZ5xADfBOgzTDAObdhzFYTsfuqKYOu9MEiy7BAR+wy8hTeEDgQ+6oLUBfPn6Ye0eeWwjfcOVl1YjuA== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(70206006)(7636003)(2906002)(6286002)(16526019)(47076005)(4326008)(70586007)(6916009)(86362001)(53546011)(426003)(36756003)(7696005)(966005)(1076003)(83380400001)(55016002)(508600001)(4001150100001)(316002)(356005)(36860700001)(8936002)(26005)(8676002)(336012)(82310400003)(54906003)(2616005)(186003)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:59:06.7416 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 98a6697e-f216-4973-a371-08d9a41796ac X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT015.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB2449 Subject: [dpdk-stable] patch 'app/testpmd: remove double dependency on bitrate lib' has been queued to stable release 20.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 20.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/12/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/27dbdfd926d978628ba95e99a7d7a23915ed7c8b Thanks. Xueming Li --- >From 27dbdfd926d978628ba95e99a7d7a23915ed7c8b Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 5 Nov 2021 14:30:18 +0100 Subject: [PATCH] app/testpmd: remove double dependency on bitrate lib Cc: Xueming Li [ upstream commit fe629897def9ff5aa003a1a298df47239afb337f ] No need for double dependency, once is enough. While at it, sort alphabetically. Fixes: fac83b3ef8ac ("app: fix missing dependencies") Signed-off-by: David Marchand Acked-by: Ferruh Yigit --- app/test-pmd/meson.build | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build index 7e9c7bdd69..4d584f7562 100644 --- a/app/test-pmd/meson.build +++ b/app/test-pmd/meson.build @@ -25,20 +25,21 @@ sources = files('5tswap.c', 'util.c') deps += ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'meter', 'bus_pci'] -if dpdk_conf.has('RTE_LIB_BITRATESTATS') - deps += 'bitratestats' -endif -if dpdk_conf.has('RTE_LIB_PDUMP') - deps += 'pdump' +if dpdk_conf.has('RTE_CRYPTO_SCHEDULER') + deps += 'crypto_scheduler' endif if dpdk_conf.has('RTE_LIB_BITRATESTATS') deps += 'bitratestats' endif +if dpdk_conf.has('RTE_LIB_BPF') + sources += files('bpf_cmd.c') + deps += 'bpf' +endif if dpdk_conf.has('RTE_LIB_LATENCYSTATS') deps += 'latencystats' endif -if dpdk_conf.has('RTE_CRYPTO_SCHEDULER') - deps += 'crypto_scheduler' +if dpdk_conf.has('RTE_LIB_PDUMP') + deps += 'pdump' endif if dpdk_conf.has('RTE_NET_BOND') deps += 'net_bond' @@ -55,7 +56,3 @@ endif if dpdk_conf.has('RTE_NET_DPAA') deps += ['bus_dpaa', 'mempool_dpaa', 'net_dpaa'] endif -if dpdk_conf.has('RTE_LIB_BPF') - sources += files('bpf_cmd.c') - deps += 'bpf' -endif -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:12.503426726 +0800 +++ 0241-app-testpmd-remove-double-dependency-on-bitrate-lib.patch 2021-11-10 14:17:02.084077679 +0800 @@ -1 +1 @@ -From fe629897def9ff5aa003a1a298df47239afb337f Mon Sep 17 00:00:00 2001 +From 27dbdfd926d978628ba95e99a7d7a23915ed7c8b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit fe629897def9ff5aa003a1a298df47239afb337f ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 21d50e92d0..b05c531c7f 100644 +index 7e9c7bdd69..4d584f7562 100644 @@ -22,2 +24,2 @@ -@@ -29,20 +29,21 @@ sources = files( - ) +@@ -25,20 +25,21 @@ sources = files('5tswap.c', + 'util.c') @@ -25 +27 @@ - deps += ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'bus_pci'] + deps += ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'meter', 'bus_pci'] @@ -27 +29 @@ -- deps += 'bitratestats' +- deps += 'bitratestats' @@ -30 +32 @@ -- deps += 'pdump' +- deps += 'pdump' @@ -32 +34 @@ -+ deps += 'crypto_scheduler' ++ deps += 'crypto_scheduler' @@ -35 +37 @@ - deps += 'bitratestats' + deps += 'bitratestats' @@ -42 +44 @@ - deps += 'latencystats' + deps += 'latencystats' @@ -45 +47 @@ -- deps += 'crypto_scheduler' +- deps += 'crypto_scheduler' @@ -47 +49 @@ -+ deps += 'pdump' ++ deps += 'pdump' @@ -50,2 +52,2 @@ - deps += 'net_bond' -@@ -59,10 +60,6 @@ endif + deps += 'net_bond' +@@ -55,7 +56,3 @@ endif @@ -53 +55 @@ - deps += ['bus_dpaa', 'mempool_dpaa', 'net_dpaa'] + deps += ['bus_dpaa', 'mempool_dpaa', 'net_dpaa'] @@ -56,2 +58,2 @@ -- sources += files('bpf_cmd.c') -- deps += 'bpf' +- sources += files('bpf_cmd.c') +- deps += 'bpf' @@ -59,3 +60,0 @@ - jansson_dep = dependency('jansson', required: false, method: 'pkg-config') - if jansson_dep.found() - dpdk_conf.set('RTE_HAS_JANSSON', 1)