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 59015A051C for ; Tue, 11 Feb 2020 14:12:05 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0645A2B89; Tue, 11 Feb 2020 14:12:05 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 238962B89 for ; Tue, 11 Feb 2020 14:12:02 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Feb 2020 05:12:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,428,1574150400"; d="scan'208";a="256466060" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga004.fm.intel.com with ESMTP; 11 Feb 2020 05:12:01 -0800 Received: from fmsmsx125.amr.corp.intel.com (10.18.125.40) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 11 Feb 2020 05:12:00 -0800 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX125.amr.corp.intel.com (10.18.125.40) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 11 Feb 2020 05:12:00 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.5]) by shsmsx102.ccr.corp.intel.com ([169.254.2.126]) with mapi id 14.03.0439.000; Tue, 11 Feb 2020 21:11:58 +0800 From: "Xu, Rosen" To: "luca.boccassi@gmail.com" , "Richardson, Bruce" CC: dpdk stable Thread-Topic: patch 'net/ipn3ke: fix meson build' has been queued to stable release 19.11.1 Thread-Index: AQHV4M3lH8YUS6AcX0qghD56zrzQu6gV9+kw Date: Tue, 11 Feb 2020 13:11:58 +0000 Message-ID: <0E78D399C70DA940A335608C6ED296D73AD49B1F@SHSMSX104.ccr.corp.intel.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> <20200211112216.3929-31-luca.boccassi@gmail.com> In-Reply-To: <20200211112216.3929-31-luca.boccassi@gmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOTcwNTJkMjYtOGI1OS00MTE0LWIxOTktYzJkZjFhY2U5YzJiIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiVXY1aGlleUtVa3hxS254cXB6WlZNSWhcL0kyeGY1RmE5TzBuV3Q1N25NcGFWZ2xRQXRkWDRjcGZPVjVFUGlLejkifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-stable] patch 'net/ipn3ke: fix meson build' has been queued to stable release 19.11.1 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 Luca, Thanks a lot. > -----Original Message----- > From: luca.boccassi@gmail.com > Sent: Tuesday, February 11, 2020 19:20 > To: Richardson, Bruce > Cc: Xu, Rosen ; dpdk stable > Subject: patch 'net/ipn3ke: fix meson build' has been queued to stable > release 19.11.1 >=20 > Hi, >=20 > FYI, your patch has been queued to stable release 19.11.1 >=20 > Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. > It will be pushed if I get no objections before 02/13/20. So please shout= if > anyone has objections. >=20 > Also note that after the patch there's a diff of the upstream commit vs t= he > 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. >=20 > Thanks. >=20 > Luca Boccassi >=20 > --- > From ea1e97addf528d6749741e8eaf60ee3fec9cbc74 Mon Sep 17 00:00:00 > 2001 > From: Bruce Richardson > Date: Thu, 12 Dec 2019 17:28:43 +0000 > Subject: [PATCH] net/ipn3ke: fix meson build >=20 > [ upstream commit 7a3c4f4de26381f3f2b85297f603ad6a5f96a9f3 ] >=20 > The ipn3ke driver and the ifpga driver had circular dependencies on each > other, meaning that neither could be built with meson. Fix this by: >=20 > * setting the build order of net and raw to match that in makefiles > * removing the dependency from the net driver on the rawdev one > * fixing the dependency names in the rawdev driver meson.build file >=20 > Fixes: 8418c92811b4 ("net/ipn3ke: remove configuration for i40e port > bonding") > Fixes: e1defba4cf66 ("raw/ifpga/base: support device tree") >=20 > Signed-off-by: Bruce Richardson > Acked-by: Rosen Xu > --- > drivers/meson.build | 4 ++-- > drivers/net/ipn3ke/meson.build | 4 +++- drivers/raw/ifpga/meson.build = | > 2 +- > 3 files changed, 6 insertions(+), 4 deletions(-) >=20 > diff --git a/drivers/meson.build b/drivers/meson.build index > 72eec46088..32d68aa1d0 100644 > --- a/drivers/meson.build > +++ b/drivers/meson.build > @@ -9,8 +9,8 @@ endif > dpdk_driver_classes =3D ['common', > 'bus', > 'mempool', # depends on common and bus. > - 'raw', # depends on common and bus. > - 'net', # depends on common, bus, mempool and raw. > + 'net', # depends on common, bus, mempool > + 'raw', # depends on common, bus and net. > 'crypto', # depends on common, bus and mempool (net in > future). > 'compress', # depends on common, bus, mempool. > 'event', # depends on common, bus, mempool and net. > diff --git a/drivers/net/ipn3ke/meson.build > b/drivers/net/ipn3ke/meson.build index e3c8a6768c..bfec592aba 100644 > --- a/drivers/net/ipn3ke/meson.build > +++ b/drivers/net/ipn3ke/meson.build > @@ -21,9 +21,11 @@ endif > if build > allow_experimental_apis =3D true >=20 > + includes +=3D include_directories('../../raw/ifpga') > + > sources +=3D files('ipn3ke_ethdev.c', > 'ipn3ke_representor.c', > 'ipn3ke_tm.c', > 'ipn3ke_flow.c') > - deps +=3D ['bus_ifpga', 'sched', 'pmd_i40e', 'rawdev', 'rawdev_ifpga'] > + deps +=3D ['bus_ifpga', 'ethdev', 'sched'] > endif > diff --git a/drivers/raw/ifpga/meson.build b/drivers/raw/ifpga/meson.buil= d > index 206136ff48..d4027068d6 100644 > --- a/drivers/raw/ifpga/meson.build > +++ b/drivers/raw/ifpga/meson.build > @@ -15,7 +15,7 @@ if build > objs =3D [base_objs] >=20 > deps +=3D ['ethdev', 'rawdev', 'pci', 'bus_pci', 'kvargs', > - 'bus_vdev', 'bus_ifpga', 'net', 'i40e', 'ipn3ke'] > + 'bus_vdev', 'bus_ifpga', 'net', 'pmd_i40e', 'pmd_ipn3ke'] > ext_deps +=3D dep >=20 > sources =3D files('ifpga_rawdev.c') > -- > 2.20.1 >=20 > --- > Diff of the applied patch vs upstream commit (please double-check if no= n- > empty: > --- > --- - 2020-02-11 11:17:40.234853543 +0000 > +++ 0031-net-ipn3ke-fix-meson-build.patch 2020-02-11 > 11:17:38.344000300 +0000 > @@ -1,8 +1,10 @@ > -From 7a3c4f4de26381f3f2b85297f603ad6a5f96a9f3 Mon Sep 17 00:00:00 2001 > +From ea1e97addf528d6749741e8eaf60ee3fec9cbc74 Mon Sep 17 00:00:00 > 2001 > From: Bruce Richardson > Date: Thu, 12 Dec 2019 17:28:43 +0000 > Subject: [PATCH] net/ipn3ke: fix meson build >=20 > +[ upstream commit 7a3c4f4de26381f3f2b85297f603ad6a5f96a9f3 ] > + > The ipn3ke driver and the ifpga driver had circular dependencies on each > other, meaning that neither could be built with meson. Fix this by: >=20 > @@ -12,7 +14,6 @@ >=20 > Fixes: 8418c92811b4 ("net/ipn3ke: remove configuration for i40e port > bonding") > Fixes: e1defba4cf66 ("raw/ifpga/base: support device tree") > -Cc: stable@dpdk.org >=20 > Signed-off-by: Bruce Richardson > Acked-by: Rosen Xu @@ -23,7 +24,7 @@ > 3 files changed, 6 insertions(+), 4 deletions(-) >=20 > diff --git a/drivers/meson.build b/drivers/meson.build -index > 3f8749d0b7..29708cc2bb 100644 > +index 72eec46088..32d68aa1d0 100644 > --- a/drivers/meson.build > +++ b/drivers/meson.build > @@ -9,8 +9,8 @@ endif > @@ -36,7 +37,7 @@ > + 'raw', # depends on common, bus and net. > 'crypto', # depends on common, bus and mempool (net in > future). > 'compress', # depends on common, bus, mempool. > - 'vdpa', # depends on common, bus and mempool. > + 'event', # depends on common, bus, mempool and net. > diff --git a/drivers/net/ipn3ke/meson.build > b/drivers/net/ipn3ke/meson.build index e3c8a6768c..bfec592aba 100644 > --- a/drivers/net/ipn3ke/meson.build