patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH v2 1/1] net/octeontx: fix meson build for disabled octeontx drivers
       [not found] <1581925669-15294-1-git-send-email-agupta3@marvell.com>
@ 2020-03-02  6:31 ` agupta3
  2020-03-02 10:53   ` [dpdk-stable] [dpdk-dev] " Bruce Richardson
  2020-03-04  5:47   ` [dpdk-stable] [PATCH v3 " agupta3
  0 siblings, 2 replies; 9+ messages in thread
From: agupta3 @ 2020-03-02  6:31 UTC (permalink / raw)
  To: Harman Kalra; +Cc: dev, stable, Amit Gupta

From: Amit Gupta <agupta3@marvell.com>

Add a additional condition to check if all required internal 
dependencies are met before building octeontx drivers using meson.

Bugzilla ID: 387

Fixes: 7f615033d64f ("drivers/net: build Cavium NIC PMDs with meson")

Signed-off-by: Amit Gupta <agupta3@marvell.com>
---
v2:
 - rebased to v20.02
 - upstream comments incorporated.

 drivers/net/octeontx/base/meson.build | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/octeontx/base/meson.build b/drivers/net/octeontx/base/meson.build
index a06a2c8..035aeda 100644
--- a/drivers/net/octeontx/base/meson.build
+++ b/drivers/net/octeontx/base/meson.build
@@ -10,7 +10,11 @@ sources = [
 depends = ['ethdev', 'mempool_octeontx']
 static_objs = []
 foreach d: depends
-	static_objs += [get_variable('static_rte_' + d)]
+	test_dep_obj = '@0@'.format(get_variable('static_rte_' + d, ''))
+	if test_dep_obj == ''
+		subdir_done()
+	endif
+	static_objs += get_variable('static_rte_' + d)
 endforeach
 
 c_args = cflags
-- 
1.8.3.1


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [dpdk-stable] [dpdk-dev] [PATCH v2 1/1] net/octeontx: fix meson build for disabled octeontx drivers
  2020-03-02  6:31 ` [dpdk-stable] [PATCH v2 1/1] net/octeontx: fix meson build for disabled octeontx drivers agupta3
@ 2020-03-02 10:53   ` Bruce Richardson
  2020-03-03  3:10     ` [dpdk-stable] [EXT] " Amit Gupta
  2020-03-04  5:47   ` [dpdk-stable] [PATCH v3 " agupta3
  1 sibling, 1 reply; 9+ messages in thread
From: Bruce Richardson @ 2020-03-02 10:53 UTC (permalink / raw)
  To: agupta3; +Cc: Harman Kalra, dev, stable

On Mon, Mar 02, 2020 at 12:01:55PM +0530, agupta3@marvell.com wrote:
> From: Amit Gupta <agupta3@marvell.com>
> 
> Add a additional condition to check if all required internal 
> dependencies are met before building octeontx drivers using meson.
> 
> Bugzilla ID: 387
> 
> Fixes: 7f615033d64f ("drivers/net: build Cavium NIC PMDs with meson")
> 
> Signed-off-by: Amit Gupta <agupta3@marvell.com>
> ---
> v2:
>  - rebased to v20.02
>  - upstream comments incorporated.
> 
>  drivers/net/octeontx/base/meson.build | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/octeontx/base/meson.build b/drivers/net/octeontx/base/meson.build
> index a06a2c8..035aeda 100644
> --- a/drivers/net/octeontx/base/meson.build
> +++ b/drivers/net/octeontx/base/meson.build
> @@ -10,7 +10,11 @@ sources = [
>  depends = ['ethdev', 'mempool_octeontx']
>  static_objs = []
>  foreach d: depends
> -	static_objs += [get_variable('static_rte_' + d)]
> +	test_dep_obj = '@0@'.format(get_variable('static_rte_' + d, ''))
> +	if test_dep_obj == ''
> +		subdir_done()
> +	endif
> +	static_objs += get_variable('static_rte_' + d)
>  endforeach

very minor nit - you can use "test_dep_obj" here rather than calling
get_variable twice.

/Bruce

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [dpdk-stable] [EXT] Re: [dpdk-dev] [PATCH v2 1/1] net/octeontx: fix meson build for disabled octeontx drivers
  2020-03-02 10:53   ` [dpdk-stable] [dpdk-dev] " Bruce Richardson
@ 2020-03-03  3:10     ` Amit Gupta
  2020-03-03 11:17       ` Bruce Richardson
  0 siblings, 1 reply; 9+ messages in thread
From: Amit Gupta @ 2020-03-03  3:10 UTC (permalink / raw)
  To: Bruce Richardson; +Cc: Harman Kalra, dev, stable

test_dep_obj is being formatted as string object, so can't be used as static obj..


Amit

> -----Original Message-----
> From: Bruce Richardson <bruce.richardson@intel.com>
> Sent: Monday, March 2, 2020 4:23 PM
> To: Amit Gupta <agupta3@marvell.com>
> Cc: Harman Kalra <hkalra@marvell.com>; dev@dpdk.org; stable@dpdk.org
> Subject: [EXT] Re: [dpdk-dev] [PATCH v2 1/1] net/octeontx: fix meson build
> for disabled octeontx drivers
> 
> External Email
> 
> ----------------------------------------------------------------------
> On Mon, Mar 02, 2020 at 12:01:55PM +0530, agupta3@marvell.com wrote:
> > From: Amit Gupta <agupta3@marvell.com>
> >
> > Add a additional condition to check if all required internal
> > dependencies are met before building octeontx drivers using meson.
> >
> > Bugzilla ID: 387
> >
> > Fixes: 7f615033d64f ("drivers/net: build Cavium NIC PMDs with meson")
> >
> > Signed-off-by: Amit Gupta <agupta3@marvell.com>
> > ---
> > v2:
> >  - rebased to v20.02
> >  - upstream comments incorporated.
> >
> >  drivers/net/octeontx/base/meson.build | 6 +++++-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/octeontx/base/meson.build
> > b/drivers/net/octeontx/base/meson.build
> > index a06a2c8..035aeda 100644
> > --- a/drivers/net/octeontx/base/meson.build
> > +++ b/drivers/net/octeontx/base/meson.build
> > @@ -10,7 +10,11 @@ sources = [
> >  depends = ['ethdev', 'mempool_octeontx']  static_objs = []  foreach
> > d: depends
> > -	static_objs += [get_variable('static_rte_' + d)]
> > +	test_dep_obj = '@0@'.format(get_variable('static_rte_' + d, ''))
> > +	if test_dep_obj == ''
> > +		subdir_done()
> > +	endif
> > +	static_objs += get_variable('static_rte_' + d)
> >  endforeach
> 
> very minor nit - you can use "test_dep_obj" here rather than calling
> get_variable twice.
> 
> /Bruce

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [dpdk-stable] [EXT] Re: [dpdk-dev] [PATCH v2 1/1] net/octeontx: fix meson build for disabled octeontx drivers
  2020-03-03  3:10     ` [dpdk-stable] [EXT] " Amit Gupta
@ 2020-03-03 11:17       ` Bruce Richardson
  2020-03-04  5:47         ` Amit Gupta
  0 siblings, 1 reply; 9+ messages in thread
From: Bruce Richardson @ 2020-03-03 11:17 UTC (permalink / raw)
  To: Amit Gupta; +Cc: Harman Kalra, dev, stable

On Tue, Mar 03, 2020 at 03:10:56AM +0000, Amit Gupta wrote:
> 
> > -----Original Message-----
> > From: Bruce Richardson <bruce.richardson@intel.com>
> > Sent: Monday, March 2, 2020 4:23 PM
> > To: Amit Gupta <agupta3@marvell.com>
> > Cc: Harman Kalra <hkalra@marvell.com>; dev@dpdk.org; stable@dpdk.org
> > Subject: [EXT] Re: [dpdk-dev] [PATCH v2 1/1] net/octeontx: fix meson build
> > for disabled octeontx drivers
> > 
> > External Email
> > 
> > ----------------------------------------------------------------------
> > On Mon, Mar 02, 2020 at 12:01:55PM +0530, agupta3@marvell.com wrote:
> > > From: Amit Gupta <agupta3@marvell.com>
> > >
> > > Add a additional condition to check if all required internal
> > > dependencies are met before building octeontx drivers using meson.
> > >
> > > Bugzilla ID: 387
> > >
> > > Fixes: 7f615033d64f ("drivers/net: build Cavium NIC PMDs with meson")
> > >
> > > Signed-off-by: Amit Gupta <agupta3@marvell.com>
> > > ---
> > > v2:
> > >  - rebased to v20.02
> > >  - upstream comments incorporated.
> > >
> > >  drivers/net/octeontx/base/meson.build | 6 +++++-
> > >  1 file changed, 5 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/net/octeontx/base/meson.build
> > > b/drivers/net/octeontx/base/meson.build
> > > index a06a2c8..035aeda 100644
> > > --- a/drivers/net/octeontx/base/meson.build
> > > +++ b/drivers/net/octeontx/base/meson.build
> > > @@ -10,7 +10,11 @@ sources = [
> > >  depends = ['ethdev', 'mempool_octeontx']  static_objs = []  foreach
> > > d: depends
> > > -	static_objs += [get_variable('static_rte_' + d)]
> > > +	test_dep_obj = '@0@'.format(get_variable('static_rte_' + d, ''))
> > > +	if test_dep_obj == ''
> > > +		subdir_done()
> > > +	endif
> > > +	static_objs += get_variable('static_rte_' + d)
> > >  endforeach
> > 
> > very minor nit - you can use "test_dep_obj" here rather than calling
> > get_variable twice.
> > 
> test_dep_obj is being formatted as string object, so can't be used as static obj..

Apologies, you are quite right, I missed that.

One final suggestion - the "is_variable" function is probably want you want
rather than using get_variable with a fallback. It should save the use of a
temporary variable completely.

/Bruce

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [dpdk-stable] [PATCH v3 1/1] net/octeontx: fix meson build for disabled octeontx drivers
  2020-03-02  6:31 ` [dpdk-stable] [PATCH v2 1/1] net/octeontx: fix meson build for disabled octeontx drivers agupta3
  2020-03-02 10:53   ` [dpdk-stable] [dpdk-dev] " Bruce Richardson
@ 2020-03-04  5:47   ` agupta3
  2020-03-04 13:49     ` [dpdk-stable] [dpdk-dev] " Bruce Richardson
  2020-04-06 10:03     ` [dpdk-stable] " Harman Kalra
  1 sibling, 2 replies; 9+ messages in thread
From: agupta3 @ 2020-03-04  5:47 UTC (permalink / raw)
  To: Harman Kalra; +Cc: dev, stable, Amit Gupta

From: Amit Gupta <agupta3@marvell.com>

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 <agupta3@marvell.com>
---
 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 a06a2c8..e1060fc 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
-- 
1.8.3.1


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [dpdk-stable] [EXT] Re: [dpdk-dev] [PATCH v2 1/1] net/octeontx: fix meson build for disabled octeontx drivers
  2020-03-03 11:17       ` Bruce Richardson
@ 2020-03-04  5:47         ` Amit Gupta
  0 siblings, 0 replies; 9+ messages in thread
From: Amit Gupta @ 2020-03-04  5:47 UTC (permalink / raw)
  To: Bruce Richardson; +Cc: Harman Kalra, dev, stable

ACK

> -----Original Message-----
> From: Bruce Richardson <bruce.richardson@intel.com>
> Sent: Tuesday, March 3, 2020 4:47 PM
> To: Amit Gupta <agupta3@marvell.com>
> Cc: Harman Kalra <hkalra@marvell.com>; dev@dpdk.org; stable@dpdk.org
> Subject: Re: [EXT] Re: [dpdk-dev] [PATCH v2 1/1] net/octeontx: fix meson
> build for disabled octeontx drivers
> 
> On Tue, Mar 03, 2020 at 03:10:56AM +0000, Amit Gupta wrote:
> >
> > > -----Original Message-----
> > > From: Bruce Richardson <bruce.richardson@intel.com>
> > > Sent: Monday, March 2, 2020 4:23 PM
> > > To: Amit Gupta <agupta3@marvell.com>
> > > Cc: Harman Kalra <hkalra@marvell.com>; dev@dpdk.org;
> stable@dpdk.org
> > > Subject: [EXT] Re: [dpdk-dev] [PATCH v2 1/1] net/octeontx: fix meson
> > > build for disabled octeontx drivers
> > >
> > > External Email
> > >
> > > --------------------------------------------------------------------
> > > -- On Mon, Mar 02, 2020 at 12:01:55PM +0530, agupta3@marvell.com
> > > wrote:
> > > > From: Amit Gupta <agupta3@marvell.com>
> > > >
> > > > Add a additional condition to check if all required internal
> > > > dependencies are met before building octeontx drivers using meson.
> > > >
> > > > Bugzilla ID: 387
> > > >
> > > > Fixes: 7f615033d64f ("drivers/net: build Cavium NIC PMDs with
> > > > meson")
> > > >
> > > > Signed-off-by: Amit Gupta <agupta3@marvell.com>
> > > > ---
> > > > v2:
> > > >  - rebased to v20.02
> > > >  - upstream comments incorporated.
> > > >
> > > >  drivers/net/octeontx/base/meson.build | 6 +++++-
> > > >  1 file changed, 5 insertions(+), 1 deletion(-)
> > > >
> > > > diff --git a/drivers/net/octeontx/base/meson.build
> > > > b/drivers/net/octeontx/base/meson.build
> > > > index a06a2c8..035aeda 100644
> > > > --- a/drivers/net/octeontx/base/meson.build
> > > > +++ b/drivers/net/octeontx/base/meson.build
> > > > @@ -10,7 +10,11 @@ sources = [
> > > >  depends = ['ethdev', 'mempool_octeontx']  static_objs = []
> > > > foreach
> > > > d: depends
> > > > -	static_objs += [get_variable('static_rte_' + d)]
> > > > +	test_dep_obj = '@0@'.format(get_variable('static_rte_' + d, ''))
> > > > +	if test_dep_obj == ''
> > > > +		subdir_done()
> > > > +	endif
> > > > +	static_objs += get_variable('static_rte_' + d)
> > > >  endforeach
> > >
> > > very minor nit - you can use "test_dep_obj" here rather than calling
> > > get_variable twice.
> > >
> > test_dep_obj is being formatted as string object, so can't be used as static
> obj..
> 
> Apologies, you are quite right, I missed that.
> 
> One final suggestion - the "is_variable" function is probably want you want
> rather than using get_variable with a fallback. It should save the use of a
> temporary variable completely.
> 
> /Bruce

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [dpdk-stable] [dpdk-dev] [PATCH v3 1/1] net/octeontx: fix meson build for disabled octeontx drivers
  2020-03-04  5:47   ` [dpdk-stable] [PATCH v3 " agupta3
@ 2020-03-04 13:49     ` Bruce Richardson
  2020-04-05 11:57       ` Jerin Jacob
  2020-04-06 10:03     ` [dpdk-stable] " Harman Kalra
  1 sibling, 1 reply; 9+ messages in thread
From: Bruce Richardson @ 2020-03-04 13:49 UTC (permalink / raw)
  To: agupta3; +Cc: Harman Kalra, dev, stable

On Wed, Mar 04, 2020 at 11:17:04AM +0530, agupta3@marvell.com wrote:
> From: Amit Gupta <agupta3@marvell.com>
> 
> 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 <agupta3@marvell.com>

Reviewed-by: Bruce Richardson <bruce.richardson@intel.com>

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [dpdk-stable] [dpdk-dev] [PATCH v3 1/1] net/octeontx: fix meson build for disabled octeontx drivers
  2020-03-04 13:49     ` [dpdk-stable] [dpdk-dev] " Bruce Richardson
@ 2020-04-05 11:57       ` Jerin Jacob
  0 siblings, 0 replies; 9+ messages in thread
From: Jerin Jacob @ 2020-04-05 11:57 UTC (permalink / raw)
  To: Bruce Richardson; +Cc: agupta3, Harman Kalra, dpdk-dev, dpdk stable

On Wed, Mar 4, 2020 at 7:19 PM Bruce Richardson
<bruce.richardson@intel.com> wrote:
>
> On Wed, Mar 04, 2020 at 11:17:04AM +0530, agupta3@marvell.com wrote:
> > From: Amit Gupta <agupta3@marvell.com>
> >
> > 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 <agupta3@marvell.com>
>
> Reviewed-by: Bruce Richardson <bruce.richardson@intel.com>

Applied to dpdk-next-net-mrvl/master. Thanks

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [dpdk-stable] [PATCH v3 1/1] net/octeontx: fix meson build for disabled octeontx drivers
  2020-03-04  5:47   ` [dpdk-stable] [PATCH v3 " agupta3
  2020-03-04 13:49     ` [dpdk-stable] [dpdk-dev] " Bruce Richardson
@ 2020-04-06 10:03     ` Harman Kalra
  1 sibling, 0 replies; 9+ messages in thread
From: Harman Kalra @ 2020-04-06 10:03 UTC (permalink / raw)
  To: agupta3; +Cc: dev, stable

On Wed, Mar 04, 2020 at 11:17:04AM +0530, agupta3@marvell.com wrote:
> From: Amit Gupta <agupta3@marvell.com>
> 
> 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 <agupta3@marvell.com>

Acked-by: Harman Kalra <hkalra@marvell.com>

> ---
>  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 a06a2c8..e1060fc 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
> -- 
> 1.8.3.1
> 

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2020-04-06 10:03 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <1581925669-15294-1-git-send-email-agupta3@marvell.com>
2020-03-02  6:31 ` [dpdk-stable] [PATCH v2 1/1] net/octeontx: fix meson build for disabled octeontx drivers agupta3
2020-03-02 10:53   ` [dpdk-stable] [dpdk-dev] " Bruce Richardson
2020-03-03  3:10     ` [dpdk-stable] [EXT] " Amit Gupta
2020-03-03 11:17       ` Bruce Richardson
2020-03-04  5:47         ` Amit Gupta
2020-03-04  5:47   ` [dpdk-stable] [PATCH v3 " agupta3
2020-03-04 13:49     ` [dpdk-stable] [dpdk-dev] " Bruce Richardson
2020-04-05 11:57       ` Jerin Jacob
2020-04-06 10:03     ` [dpdk-stable] " Harman Kalra

patches for DPDK stable branches

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git