[PATCH 1/4] build: include missing hypervisor files in Meson build

[PATCH 1/4] build: include missing hypervisor files in Meson build

[Luca Boccassi]

They are built by the legacy makefiles but not by Meson.

Fixes: 8f40ee0734c8 ("eal/x86: get hypervisor name")

Signed-off-by: Luca Boccassi <bluca@debian.org>
---
 lib/librte_eal/common/arch/arm/meson.build | 2 +-
 lib/librte_eal/common/arch/x86/meson.build | 2 +-
 lib/librte_eal/common/meson.build          | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/common/arch/arm/meson.build b/lib/librte_eal/common/arch/arm/meson.build
index c6bd92272b..79731e1a2c 100644
--- a/lib/librte_eal/common/arch/arm/meson.build
+++ b/lib/librte_eal/common/arch/arm/meson.build
@@ -2,4 +2,4 @@
 # Copyright(c) 2017 Intel Corporation.
 
 eal_common_arch_sources = files('rte_cpuflags.c',
-	'rte_cycles.c')
+	'rte_cycles.c', 'rte_hypervisor.c')
diff --git a/lib/librte_eal/common/arch/x86/meson.build b/lib/librte_eal/common/arch/x86/meson.build
index 4e0f77900a..14bf204c6f 100644
--- a/lib/librte_eal/common/arch/x86/meson.build
+++ b/lib/librte_eal/common/arch/x86/meson.build
@@ -2,4 +2,4 @@
 # Copyright(c) 2017 Intel Corporation
 
 eal_common_arch_sources = files('rte_spinlock.c', 'rte_cpuflags.c',
-	'rte_cycles.c')
+	'rte_cycles.c', 'rte_hypervisor.c')
diff --git a/lib/librte_eal/common/meson.build b/lib/librte_eal/common/meson.build
index 56005bea80..b7fc984997 100644
--- a/lib/librte_eal/common/meson.build
+++ b/lib/librte_eal/common/meson.build
@@ -14,6 +14,7 @@ common_sources = files(
 	'eal_common_errno.c',
 	'eal_common_fbarray.c',
 	'eal_common_hexdump.c',
+	'eal_common_hypervisor.c',
 	'eal_common_launch.c',
 	'eal_common_lcore.c',
 	'eal_common_log.c',
@@ -59,6 +60,7 @@ common_headers = files(
 	'include/rte_errno.h',
 	'include/rte_fbarray.h',
 	'include/rte_hexdump.h',
+	'include/rte_hypervisor.h',
 	'include/rte_interrupts.h',
 	'include/rte_keepalive.h',
 	'include/rte_launch.h',
-- 
2.18.0

[PATCH 2/4] build: use -Wno-error=format-security for Meson ifpga_rawdev build

[Luca Boccassi]

This PMD is built with -Wno-format, which means GCC errors out if
-Wformat-security is used.

Fixes: 56bb54ea1bdf ("raw/ifpga/base: add Intel FPGA OPAE share code")

Signed-off-by: Luca Boccassi <bluca@debian.org>
---
 drivers/raw/ifpga_rawdev/base/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/raw/ifpga_rawdev/base/meson.build b/drivers/raw/ifpga_rawdev/base/meson.build
index cb6553521d..aadfc19084 100644
--- a/drivers/raw/ifpga_rawdev/base/meson.build
+++ b/drivers/raw/ifpga_rawdev/base/meson.build
@@ -19,7 +19,7 @@ sources = [
 
 error_cflags = ['-Wno-sign-compare', '-Wno-unused-value',
 		'-Wno-format', '-Wno-unused-but-set-variable',
-		'-Wno-strict-aliasing'
+		'-Wno-strict-aliasing', '-Wno-error=format-security'
 ]
 c_args = cflags
 foreach flag: error_cflags
-- 
2.18.0

[PATCH 3/4] build: use -Wno-error=format-security for Meson i40e build

[Luca Boccassi]

This PMD is built with -Wno-format, which means GCC errors out if
-Wformat-security is used.

Fixes: e940646b20fa ("drivers/net: build Intel NIC PMDs with meson")

Signed-off-by: Luca Boccassi <bluca@debian.org>
---
 drivers/net/i40e/base/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/i40e/base/meson.build b/drivers/net/i40e/base/meson.build
index 401a1477fa..50bd4704e6 100644
--- a/drivers/net/i40e/base/meson.build
+++ b/drivers/net/i40e/base/meson.build
@@ -13,7 +13,7 @@ sources = [
 
 error_cflags = ['-Wno-sign-compare', '-Wno-unused-value',
 		'-Wno-format', '-Wno-unused-but-set-variable',
-		'-Wno-strict-aliasing'
+		'-Wno-strict-aliasing', '-Wno-error=format-security'
 ]
 c_args = cflags
 foreach flag: error_cflags
-- 
2.18.0

[PATCH 4/4] build: install igb_uio kernel module when building with Meson

[Luca Boccassi]

Install in $kerneldir/../extra/dpdk. Usually $kerneldir should something
like: /lib/modules/$kver/build, so this directory will match the default
one used by legacy makefiles.

Fixes: a52f4574f798 ("igb_uio: build with meson")

Signed-off-by: Luca Boccassi <bluca@debian.org>
---
 kernel/linux/igb_uio/meson.build | 2 ++
 meson_options.txt                | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel/linux/igb_uio/meson.build b/kernel/linux/igb_uio/meson.build
index 71ed2e7a85..f5a9d5ccf3 100644
--- a/kernel/linux/igb_uio/meson.build
+++ b/kernel/linux/igb_uio/meson.build
@@ -15,4 +15,6 @@ custom_target('igb_uio',
 			'/../../../lib/librte_eal/common/include',
 		'modules'],
 	depends: mkfile,
+	install: true,
+	install_dir: kernel_dir + '/../extra/dpdk',
 	build_by_default: get_option('enable_kmods'))
diff --git a/meson_options.txt b/meson_options.txt
index c843278587..f452986da3 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -7,7 +7,7 @@ option('examples', type: 'string', value: '',
 option('include_subdir_arch', type: 'string', value: '',
 	description: 'subdirectory where to install arch-dependent headers')
 option('kernel_dir', type: 'string', value: '',
-	description: 'path to the kernel for building kernel modules')
+	description: 'path to the kernel for building kernel modules, they will be installed in $prefix/$kernel_dir/../extra/dpdk')
 option('lib_musdk_dir', type: 'string', value: '',
 	description: 'path to the MUSDK library installation directory')
 option('machine', type: 'string', value: 'native',
-- 
2.18.0

Re: [PATCH 4/4] build: install igb_uio kernel module when building with Meson

[Bruce Richardson]

On Fri, Aug 31, 2018 at 10:20:29AM +0100, Luca Boccassi wrote:
> Install in $kerneldir/../extra/dpdk. Usually $kerneldir should something
> like: /lib/modules/$kver/build, so this directory will match the default
> one used by legacy makefiles.
> 
> Fixes: a52f4574f798 ("igb_uio: build with meson")
> 
> Signed-off-by: Luca Boccassi <bluca@debian.org>
> ---
>  kernel/linux/igb_uio/meson.build | 2 ++
>  meson_options.txt                | 2 +-
>  2 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/kernel/linux/igb_uio/meson.build b/kernel/linux/igb_uio/meson.build
> index 71ed2e7a85..f5a9d5ccf3 100644
> --- a/kernel/linux/igb_uio/meson.build
> +++ b/kernel/linux/igb_uio/meson.build
> @@ -15,4 +15,6 @@ custom_target('igb_uio',
>  			'/../../../lib/librte_eal/common/include',
>  		'modules'],
>  	depends: mkfile,
> +	install: true,
> +	install_dir: kernel_dir + '/../extra/dpdk',
>  	build_by_default: get_option('enable_kmods'))
> diff --git a/meson_options.txt b/meson_options.txt
> index c843278587..f452986da3 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -7,7 +7,7 @@ option('examples', type: 'string', value: '',
>  option('include_subdir_arch', type: 'string', value: '',
>  	description: 'subdirectory where to install arch-dependent headers')
>  option('kernel_dir', type: 'string', value: '',
> -	description: 'path to the kernel for building kernel modules')
> +	description: 'path to the kernel for building kernel modules, they will be installed in $prefix/$kernel_dir/../extra/dpdk')

Will $prefix be used in the install path? I thought it would be $DEST_DIR?

Re: [PATCH 2/4] build: use -Wno-error=format-security for Meson ifpga_rawdev build

[Bruce Richardson]

On Fri, Aug 31, 2018 at 10:20:27AM +0100, Luca Boccassi wrote:
> This PMD is built with -Wno-format, which means GCC errors out if
> -Wformat-security is used.
> 
> Fixes: 56bb54ea1bdf ("raw/ifpga/base: add Intel FPGA OPAE share code")
> 
> Signed-off-by: Luca Boccassi <bluca@debian.org>
> ---
>  drivers/raw/ifpga_rawdev/base/meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/raw/ifpga_rawdev/base/meson.build b/drivers/raw/ifpga_rawdev/base/meson.build
> index cb6553521d..aadfc19084 100644
> --- a/drivers/raw/ifpga_rawdev/base/meson.build
> +++ b/drivers/raw/ifpga_rawdev/base/meson.build
> @@ -19,7 +19,7 @@ sources = [
>  
>  error_cflags = ['-Wno-sign-compare', '-Wno-unused-value',
>  		'-Wno-format', '-Wno-unused-but-set-variable',
> -		'-Wno-strict-aliasing'
> +		'-Wno-strict-aliasing', '-Wno-error=format-security'

For readability, should format-security be placed right beside the
Wno-format, since both go together? Makes the diff a little bigger, but the
result would be better, I feel.

/Bruce

Re: [PATCH 4/4] build: install igb_uio kernel module when building with Meson

[Luca Boccassi]

On Fri, 2018-08-31 at 11:15 +0100, Bruce Richardson wrote:
> On Fri, Aug 31, 2018 at 10:20:29AM +0100, Luca Boccassi wrote:
> > Install in $kerneldir/../extra/dpdk. Usually $kerneldir should
> > something
> > like: /lib/modules/$kver/build, so this directory will match the
> > default
> > one used by legacy makefiles.
> > 
> > Fixes: a52f4574f798 ("igb_uio: build with meson")
> > 
> > Signed-off-by: Luca Boccassi <bluca@debian.org>
> > ---
> >  kernel/linux/igb_uio/meson.build | 2 ++
> >  meson_options.txt                | 2 +-
> >  2 files changed, 3 insertions(+), 1 deletion(-)
> > 
> > diff --git a/kernel/linux/igb_uio/meson.build
> > b/kernel/linux/igb_uio/meson.build
> > index 71ed2e7a85..f5a9d5ccf3 100644
> > --- a/kernel/linux/igb_uio/meson.build
> > +++ b/kernel/linux/igb_uio/meson.build
> > @@ -15,4 +15,6 @@ custom_target('igb_uio',
> >  			'/../../../lib/librte_eal/common/include',
> >  		'modules'],
> >  	depends: mkfile,
> > +	install: true,
> > +	install_dir: kernel_dir + '/../extra/dpdk',
> >  	build_by_default: get_option('enable_kmods'))
> > diff --git a/meson_options.txt b/meson_options.txt
> > index c843278587..f452986da3 100644
> > --- a/meson_options.txt
> > +++ b/meson_options.txt
> > @@ -7,7 +7,7 @@ option('examples', type: 'string', value: '',
> >  option('include_subdir_arch', type: 'string', value: '',
> >  	description: 'subdirectory where to install arch-dependent 
> > headers')
> >  option('kernel_dir', type: 'string', value: '',
> > -	description: 'path to the kernel for building kernel
> > modules')
> > +	description: 'path to the kernel for building kernel
> > modules, they will be installed in
> > $prefix/$kernel_dir/../extra/dpdk')
> 
> Will $prefix be used in the install path? I thought it would be
> $DEST_DIR?

Yeah it was meant as a pseudo-variable :-)

-- 
Kind regards,
Luca Boccassi

Re: [PATCH 2/4] build: use -Wno-error=format-security for Meson ifpga_rawdev build

[Luca Boccassi]

On Fri, 2018-08-31 at 11:17 +0100, Bruce Richardson wrote:
> On Fri, Aug 31, 2018 at 10:20:27AM +0100, Luca Boccassi wrote:
> > This PMD is built with -Wno-format, which means GCC errors out if
> > -Wformat-security is used.
> > 
> > Fixes: 56bb54ea1bdf ("raw/ifpga/base: add Intel FPGA OPAE share
> > code")
> > 
> > Signed-off-by: Luca Boccassi <bluca@debian.org>
> > ---
> >  drivers/raw/ifpga_rawdev/base/meson.build | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/raw/ifpga_rawdev/base/meson.build
> > b/drivers/raw/ifpga_rawdev/base/meson.build
> > index cb6553521d..aadfc19084 100644
> > --- a/drivers/raw/ifpga_rawdev/base/meson.build
> > +++ b/drivers/raw/ifpga_rawdev/base/meson.build
> > @@ -19,7 +19,7 @@ sources = [
> >  
> >  error_cflags = ['-Wno-sign-compare', '-Wno-unused-value',
> >  		'-Wno-format', '-Wno-unused-but-set-variable',
> > -		'-Wno-strict-aliasing'
> > +		'-Wno-strict-aliasing', '-Wno-error=format-
> > security'
> 
> For readability, should format-security be placed right beside the
> Wno-format, since both go together? Makes the diff a little bigger,
> but the
> result would be better, I feel.
> 
> /Bruce

Sure, will change that.

-- 
Kind regards,
Luca Boccassi

[PATCH v2 1/4] build: include missing hypervisor files in Meson build

[Luca Boccassi]

They are built by the legacy makefiles but not by Meson.

Fixes: 8f40ee0734c8 ("eal/x86: get hypervisor name")

Signed-off-by: Luca Boccassi <bluca@debian.org>
---
 lib/librte_eal/common/arch/arm/meson.build | 2 +-
 lib/librte_eal/common/arch/x86/meson.build | 2 +-
 lib/librte_eal/common/meson.build          | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/common/arch/arm/meson.build b/lib/librte_eal/common/arch/arm/meson.build
index c6bd92272b..79731e1a2c 100644
--- a/lib/librte_eal/common/arch/arm/meson.build
+++ b/lib/librte_eal/common/arch/arm/meson.build
@@ -2,4 +2,4 @@
 # Copyright(c) 2017 Intel Corporation.
 
 eal_common_arch_sources = files('rte_cpuflags.c',
-	'rte_cycles.c')
+	'rte_cycles.c', 'rte_hypervisor.c')
diff --git a/lib/librte_eal/common/arch/x86/meson.build b/lib/librte_eal/common/arch/x86/meson.build
index 4e0f77900a..14bf204c6f 100644
--- a/lib/librte_eal/common/arch/x86/meson.build
+++ b/lib/librte_eal/common/arch/x86/meson.build
@@ -2,4 +2,4 @@
 # Copyright(c) 2017 Intel Corporation
 
 eal_common_arch_sources = files('rte_spinlock.c', 'rte_cpuflags.c',
-	'rte_cycles.c')
+	'rte_cycles.c', 'rte_hypervisor.c')
diff --git a/lib/librte_eal/common/meson.build b/lib/librte_eal/common/meson.build
index 56005bea80..b7fc984997 100644
--- a/lib/librte_eal/common/meson.build
+++ b/lib/librte_eal/common/meson.build
@@ -14,6 +14,7 @@ common_sources = files(
 	'eal_common_errno.c',
 	'eal_common_fbarray.c',
 	'eal_common_hexdump.c',
+	'eal_common_hypervisor.c',
 	'eal_common_launch.c',
 	'eal_common_lcore.c',
 	'eal_common_log.c',
@@ -59,6 +60,7 @@ common_headers = files(
 	'include/rte_errno.h',
 	'include/rte_fbarray.h',
 	'include/rte_hexdump.h',
+	'include/rte_hypervisor.h',
 	'include/rte_interrupts.h',
 	'include/rte_keepalive.h',
 	'include/rte_launch.h',
-- 
2.18.0

[PATCH v2 2/4] build: use -Wno-error=format-security for Meson ifpga_rawdev build

[Luca Boccassi]

This PMD is built with -Wno-format, which means GCC errors out if
-Wformat-security is used.

Fixes: 56bb54ea1bdf ("raw/ifpga/base: add Intel FPGA OPAE share code")

Signed-off-by: Luca Boccassi <bluca@debian.org>
---
v2: re-arranged flags

 drivers/raw/ifpga_rawdev/base/meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/raw/ifpga_rawdev/base/meson.build b/drivers/raw/ifpga_rawdev/base/meson.build
index cb6553521d..03f5112caa 100644
--- a/drivers/raw/ifpga_rawdev/base/meson.build
+++ b/drivers/raw/ifpga_rawdev/base/meson.build
@@ -18,8 +18,8 @@ sources = [
 ]
 
 error_cflags = ['-Wno-sign-compare', '-Wno-unused-value',
-		'-Wno-format', '-Wno-unused-but-set-variable',
-		'-Wno-strict-aliasing'
+		'-Wno-format', '-Wno-error=format-security',
+		'-Wno-strict-aliasing', '-Wno-unused-but-set-variable'
 ]
 c_args = cflags
 foreach flag: error_cflags
-- 
2.18.0

[PATCH v2 3/4] build: use -Wno-error=format-security for Meson i40e build

[Luca Boccassi]

This PMD is built with -Wno-format, which means GCC errors out if
-Wformat-security is used.

Fixes: e940646b20fa ("drivers/net: build Intel NIC PMDs with meson")

Signed-off-by: Luca Boccassi <bluca@debian.org>
---
v2: re-arranged flags

 drivers/net/i40e/base/meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/i40e/base/meson.build b/drivers/net/i40e/base/meson.build
index 401a1477fa..e6163eaa6c 100644
--- a/drivers/net/i40e/base/meson.build
+++ b/drivers/net/i40e/base/meson.build
@@ -12,8 +12,8 @@ sources = [
 ]
 
 error_cflags = ['-Wno-sign-compare', '-Wno-unused-value',
-		'-Wno-format', '-Wno-unused-but-set-variable',
-		'-Wno-strict-aliasing'
+		'-Wno-format', '-Wno-error=format-security',
+		'-Wno-strict-aliasing', '-Wno-unused-but-set-variable'
 ]
 c_args = cflags
 foreach flag: error_cflags
-- 
2.18.0

[PATCH v2 4/4] build: install igb_uio kernel module when building with Meson

[Luca Boccassi]

Install in $kerneldir/../extra/dpdk. Usually $kerneldir should something
like: /lib/modules/$kver/build, so this directory will match the default
one used by legacy makefiles.

Fixes: a52f4574f798 ("igb_uio: build with meson")

Signed-off-by: Luca Boccassi <bluca@debian.org>
---
v2: fixed DEST_DIR in option help text

 kernel/linux/igb_uio/meson.build | 2 ++
 meson_options.txt                | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel/linux/igb_uio/meson.build b/kernel/linux/igb_uio/meson.build
index 71ed2e7a85..f5a9d5ccf3 100644
--- a/kernel/linux/igb_uio/meson.build
+++ b/kernel/linux/igb_uio/meson.build
@@ -15,4 +15,6 @@ custom_target('igb_uio',
 			'/../../../lib/librte_eal/common/include',
 		'modules'],
 	depends: mkfile,
+	install: true,
+	install_dir: kernel_dir + '/../extra/dpdk',
 	build_by_default: get_option('enable_kmods'))
diff --git a/meson_options.txt b/meson_options.txt
index c843278587..f20887212a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -7,7 +7,7 @@ option('examples', type: 'string', value: '',
 option('include_subdir_arch', type: 'string', value: '',
 	description: 'subdirectory where to install arch-dependent headers')
 option('kernel_dir', type: 'string', value: '',
-	description: 'path to the kernel for building kernel modules')
+	description: 'path to the kernel for building kernel modules, they will be installed in $DEST_DIR/$kernel_dir/../extra/dpdk')
 option('lib_musdk_dir', type: 'string', value: '',
 	description: 'path to the MUSDK library installation directory')
 option('machine', type: 'string', value: 'native',
-- 
2.18.0

Re: [PATCH v2 1/4] build: include missing hypervisor files in Meson build

[Bruce Richardson]

On Fri, Aug 31, 2018 at 11:41:51AM +0100, Luca Boccassi wrote:
> They are built by the legacy makefiles but not by Meson.
> 
> Fixes: 8f40ee0734c8 ("eal/x86: get hypervisor name")
> 
> Signed-off-by: Luca Boccassi <bluca@debian.org>

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

Re: [PATCH v2 2/4] build: use -Wno-error=format-security for Meson ifpga_rawdev build

[Bruce Richardson]

On Fri, Aug 31, 2018 at 11:41:52AM +0100, Luca Boccassi wrote:
> This PMD is built with -Wno-format, which means GCC errors out if
> -Wformat-security is used.
> 
> Fixes: 56bb54ea1bdf ("raw/ifpga/base: add Intel FPGA OPAE share code")
> 
> Signed-off-by: Luca Boccassi <bluca@debian.org>

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

Re: [PATCH v2 3/4] build: use -Wno-error=format-security for Meson i40e build

[Bruce Richardson]

On Fri, Aug 31, 2018 at 11:41:53AM +0100, Luca Boccassi wrote:
> This PMD is built with -Wno-format, which means GCC errors out if
> -Wformat-security is used.
> 
> Fixes: e940646b20fa ("drivers/net: build Intel NIC PMDs with meson")
> 
> Signed-off-by: Luca Boccassi <bluca@debian.org>

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

Re: [PATCH v2 4/4] build: install igb_uio kernel module when building with Meson

[Bruce Richardson]

On Fri, Aug 31, 2018 at 11:41:54AM +0100, Luca Boccassi wrote:
> Install in $kerneldir/../extra/dpdk. Usually $kerneldir should something
> like: /lib/modules/$kver/build, so this directory will match the default
> one used by legacy makefiles.
> 
> Fixes: a52f4574f798 ("igb_uio: build with meson")
> 
> Signed-off-by: Luca Boccassi <bluca@debian.org>
> ---

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

Re: [PATCH v2 1/4] build: include missing hypervisor files in Meson build

[Thomas Monjalon]

31/08/2018 13:00, Bruce Richardson:
> On Fri, Aug 31, 2018 at 11:41:51AM +0100, Luca Boccassi wrote:
> > They are built by the legacy makefiles but not by Meson.
> > 
> > Fixes: 8f40ee0734c8 ("eal/x86: get hypervisor name")
> > 
> > Signed-off-by: Luca Boccassi <bluca@debian.org>
> 
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>

Should we add "Cc: stable@dpdk.org" for the whole series?

Re: [PATCH v2 1/4] build: include missing hypervisor files in Meson build

[Bruce Richardson]

On Sun, Sep 16, 2018 at 11:00:24AM +0200, Thomas Monjalon wrote:
> 31/08/2018 13:00, Bruce Richardson:
> > On Fri, Aug 31, 2018 at 11:41:51AM +0100, Luca Boccassi wrote:
> > > They are built by the legacy makefiles but not by Meson.
> > > 
> > > Fixes: 8f40ee0734c8 ("eal/x86: get hypervisor name")
> > > 
> > > Signed-off-by: Luca Boccassi <bluca@debian.org>
> > 
> > Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> 
> Should we add "Cc: stable@dpdk.org" for the whole series?
> 
Yes, it wouldn't hurt to do so.

[PATCH v3 1/4] build: include missing hypervisor files in Meson build

[Luca Boccassi]

They are built by the legacy makefiles but not by Meson.

Fixes: 8f40ee0734c8 ("eal/x86: get hypervisor name")
Cc: stable@dpdk.org

Signed-off-by: Luca Boccassi <bluca@debian.org>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
v3: added acked-by and cc stable

 lib/librte_eal/common/arch/arm/meson.build | 2 +-
 lib/librte_eal/common/arch/x86/meson.build | 2 +-
 lib/librte_eal/common/meson.build          | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/common/arch/arm/meson.build b/lib/librte_eal/common/arch/arm/meson.build
index c6bd92272b..79731e1a2c 100644
--- a/lib/librte_eal/common/arch/arm/meson.build
+++ b/lib/librte_eal/common/arch/arm/meson.build
@@ -2,4 +2,4 @@
 # Copyright(c) 2017 Intel Corporation.
 
 eal_common_arch_sources = files('rte_cpuflags.c',
-	'rte_cycles.c')
+	'rte_cycles.c', 'rte_hypervisor.c')
diff --git a/lib/librte_eal/common/arch/x86/meson.build b/lib/librte_eal/common/arch/x86/meson.build
index 4e0f77900a..14bf204c6f 100644
--- a/lib/librte_eal/common/arch/x86/meson.build
+++ b/lib/librte_eal/common/arch/x86/meson.build
@@ -2,4 +2,4 @@
 # Copyright(c) 2017 Intel Corporation
 
 eal_common_arch_sources = files('rte_spinlock.c', 'rte_cpuflags.c',
-	'rte_cycles.c')
+	'rte_cycles.c', 'rte_hypervisor.c')
diff --git a/lib/librte_eal/common/meson.build b/lib/librte_eal/common/meson.build
index 56005bea80..b7fc984997 100644
--- a/lib/librte_eal/common/meson.build
+++ b/lib/librte_eal/common/meson.build
@@ -14,6 +14,7 @@ common_sources = files(
 	'eal_common_errno.c',
 	'eal_common_fbarray.c',
 	'eal_common_hexdump.c',
+	'eal_common_hypervisor.c',
 	'eal_common_launch.c',
 	'eal_common_lcore.c',
 	'eal_common_log.c',
@@ -59,6 +60,7 @@ common_headers = files(
 	'include/rte_errno.h',
 	'include/rte_fbarray.h',
 	'include/rte_hexdump.h',
+	'include/rte_hypervisor.h',
 	'include/rte_interrupts.h',
 	'include/rte_keepalive.h',
 	'include/rte_launch.h',
-- 
2.18.0

[PATCH v3 2/4] build: use -Wno-error=format-security for Meson ifpga_rawdev build

[Luca Boccassi]

This PMD is built with -Wno-format, which means GCC errors out if
-Wformat-security is used.

Fixes: 56bb54ea1bdf ("raw/ifpga/base: add Intel FPGA OPAE share code")
Cc: stable@dpdk.org

Signed-off-by: Luca Boccassi <bluca@debian.org>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
v2: re-arranged flags
v3: added acked-by and cc stable

 drivers/raw/ifpga_rawdev/base/meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/raw/ifpga_rawdev/base/meson.build b/drivers/raw/ifpga_rawdev/base/meson.build
index cb6553521d..03f5112caa 100644
--- a/drivers/raw/ifpga_rawdev/base/meson.build
+++ b/drivers/raw/ifpga_rawdev/base/meson.build
@@ -18,8 +18,8 @@ sources = [
 ]
 
 error_cflags = ['-Wno-sign-compare', '-Wno-unused-value',
-		'-Wno-format', '-Wno-unused-but-set-variable',
-		'-Wno-strict-aliasing'
+		'-Wno-format', '-Wno-error=format-security',
+		'-Wno-strict-aliasing', '-Wno-unused-but-set-variable'
 ]
 c_args = cflags
 foreach flag: error_cflags
-- 
2.18.0

[PATCH v3 3/4] build: use -Wno-error=format-security for Meson i40e build

[Luca Boccassi]

This PMD is built with -Wno-format, which means GCC errors out if
-Wformat-security is used.

Fixes: e940646b20fa ("drivers/net: build Intel NIC PMDs with meson")
Cc: stable@dpdk.org

Signed-off-by: Luca Boccassi <bluca@debian.org>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
v2: re-arranged flags
v3: added acked-by and cc stable

 drivers/net/i40e/base/meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/i40e/base/meson.build b/drivers/net/i40e/base/meson.build
index 401a1477fa..e6163eaa6c 100644
--- a/drivers/net/i40e/base/meson.build
+++ b/drivers/net/i40e/base/meson.build
@@ -12,8 +12,8 @@ sources = [
 ]
 
 error_cflags = ['-Wno-sign-compare', '-Wno-unused-value',
-		'-Wno-format', '-Wno-unused-but-set-variable',
-		'-Wno-strict-aliasing'
+		'-Wno-format', '-Wno-error=format-security',
+		'-Wno-strict-aliasing', '-Wno-unused-but-set-variable'
 ]
 c_args = cflags
 foreach flag: error_cflags
-- 
2.18.0

[PATCH v3 4/4] build: install igb_uio kernel module when building with Meson

[Luca Boccassi]

Install in $kerneldir/../extra/dpdk. Usually $kerneldir should something
like: /lib/modules/$kver/build, so this directory will match the default
one used by legacy makefiles.

Fixes: a52f4574f798 ("igb_uio: build with meson")
Cc: stable@dpdk.org

Signed-off-by: Luca Boccassi <bluca@debian.org>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
v2: fixed DEST_DIR in option help text
v3: added acked-by and cc stable

 kernel/linux/igb_uio/meson.build | 2 ++
 meson_options.txt                | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel/linux/igb_uio/meson.build b/kernel/linux/igb_uio/meson.build
index 71ed2e7a85..f5a9d5ccf3 100644
--- a/kernel/linux/igb_uio/meson.build
+++ b/kernel/linux/igb_uio/meson.build
@@ -15,4 +15,6 @@ custom_target('igb_uio',
 			'/../../../lib/librte_eal/common/include',
 		'modules'],
 	depends: mkfile,
+	install: true,
+	install_dir: kernel_dir + '/../extra/dpdk',
 	build_by_default: get_option('enable_kmods'))
diff --git a/meson_options.txt b/meson_options.txt
index c843278587..f20887212a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -7,7 +7,7 @@ option('examples', type: 'string', value: '',
 option('include_subdir_arch', type: 'string', value: '',
 	description: 'subdirectory where to install arch-dependent headers')
 option('kernel_dir', type: 'string', value: '',
-	description: 'path to the kernel for building kernel modules')
+	description: 'path to the kernel for building kernel modules, they will be installed in $DEST_DIR/$kernel_dir/../extra/dpdk')
 option('lib_musdk_dir', type: 'string', value: '',
 	description: 'path to the MUSDK library installation directory')
 option('machine', type: 'string', value: 'native',
-- 
2.18.0

Re: [PATCH v2 1/4] build: include missing hypervisor files in Meson build

[Luca Boccassi]

On Mon, 2018-09-17 at 09:20 +0100, Bruce Richardson wrote:
> On Sun, Sep 16, 2018 at 11:00:24AM +0200, Thomas Monjalon wrote:
> > 31/08/2018 13:00, Bruce Richardson:
> > > On Fri, Aug 31, 2018 at 11:41:51AM +0100, Luca Boccassi wrote:
> > > > They are built by the legacy makefiles but not by Meson.
> > > > 
> > > > Fixes: 8f40ee0734c8 ("eal/x86: get hypervisor name")
> > > > 
> > > > Signed-off-by: Luca Boccassi <bluca@debian.org>
> > > 
> > > Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> > 
> > Should we add "Cc: stable@dpdk.org" for the whole series?
> > 
> 
> Yes, it wouldn't hurt to do so.

Done in v3, thanks

-- 
Kind regards,
Luca Boccassi

Re: [PATCH v3 1/4] build: include missing hypervisor files in Meson build

[Thomas Monjalon]

17/09/2018 11:01, Luca Boccassi:
> They are built by the legacy makefiles but not by Meson.
> 
> Fixes: 8f40ee0734c8 ("eal/x86: get hypervisor name")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Luca Boccassi <bluca@debian.org>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>

Series applied, thanks