build: include missing hypervisor files in Meson build
Subsystems (2)
PATCH 1/4 build: include missing hypervisor files in Meson build
They are built by the legacy makefiles but not by Meson.
--- 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(-)
lib/librte_eal/common/arch/arm/meson.build +1 -1
@@ -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')
lib/librte_eal/common/arch/x86/meson.build +1 -1
@@ -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')
lib/librte_eal/common/meson.build +2 -0
@@ -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',
Signature · 1 line
2.18.0
PATCH 2/4 build: use -Wno-error=format-security for Meson ifpga_rawdev build
This PMD is built with -Wno-format, which means GCC errors out if -Wformat-security is used.
--- drivers/raw/ifpga_rawdev/base/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/raw/ifpga_rawdev/base/meson.build +1 -1
@@ -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
Signature · 1 line
2.18.0
Re: [PATCH 2/4] build: use -Wno-error=format-security for Meson ifpga_rawdev build
Quoted 15 lines · 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 <[email protected]>--- drivers/raw/ifpga_rawdev/base/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/raw/ifpga_rawdev/base/meson.build +0
-0
drivers/raw/ifpga_rawdev/base/meson.build sources = [ · line 22
Quoted 5 lines
drivers/raw/ifpga_rawdev/base/meson.build +1
-1@@ -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 2/4] build: use -Wno-error=format-security for Meson ifpga_rawdev build
Quoted 30 lines · Bruce Richardson
Quoted 22 lines · 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 sharecode")
Signed-off-by Luca Boccassi <[email protected]>---
drivers/raw/ifpga_rawdev/base/meson.build | 2 +-1 file changed, 1 insertion(+), 1 deletion(-)drivers/raw/ifpga_rawdev/base/meson.build +0
-0@@ -19,7 +19,7 @@ sources = [
error_cflags = ['-Wno-sign-compare', '-Wno-unused-value', '-Wno-format', '-Wno-unused-but-set-variable',drivers/raw/ifpga_rawdev/base/meson.build +1
-1- '-Wno-strict-aliasing' + '-Wno-strict-aliasing', '-Wno-error=format-Quoted 1 line
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.
Quoted 1 line
/Bruce
Sure, will change that.
Signature · 2 lines
Kind regards, Luca Boccassi
PATCH 3/4 build: use -Wno-error=format-security for Meson i40e build
In reply to Luca BoccassiThis PMD is built with -Wno-format, which means GCC errors out if -Wformat-security is used.
--- drivers/net/i40e/base/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/i40e/base/meson.build +1 -1
@@ -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
Signature · 1 line
2.18.0
PATCH 4/4 build: install igb_uio kernel module when building with Meson
In reply to Luca BoccassiInstall 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.
--- kernel/linux/igb_uio/meson.build | 2 ++ meson_options.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
kernel/linux/igb_uio/meson.build +2 -0
@@ -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'))
meson_options.txt +1 -1
@@ -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',
Signature · 1 line
2.18.0
Re: [PATCH 4/4] build: install igb_uio kernel module when building with Meson
Quoted 28 lines · 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 <[email protected]>--- kernel/linux/igb_uio/meson.build | 2 ++ meson_options.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)kernel/linux/igb_uio/meson.build +2
-0@@ -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'))meson_options.txt +0
-0
meson_options.txt option('examples', type: 'string', value: '', · line 10
Quoted 5 lines
meson_options.txt +1
-1@@ -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 4/4] build: install igb_uio kernel module when building with Meson
Quoted 36 lines · Bruce Richardson
Quoted 35 lines · 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 <[email protected]>---
kernel/linux/igb_uio/meson.build | 2 ++
meson_options.txt | 2 +-2 files changed, 3 insertions(+), 1 deletion(-)kernel/linux/igb_uio/meson.build +2
-0@@ -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'))meson_options.txt +0
-0@@ -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: '',
Quoted 8 lines
Quoted 5 lines
meson_options.txt +0
-1- description: 'path to the kernel for building kernelmodules')
meson_options.txt +1
-0+ description: 'path to the kernel for building kernelmodules, 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 :-)
Signature · 2 lines
Kind regards, Luca Boccassi
PATCH v2 1/4 build: include missing hypervisor files in Meson build
In reply to Luca BoccassiThey are built by the legacy makefiles but not by Meson.
--- 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(-)
lib/librte_eal/common/arch/arm/meson.build +1 -1
@@ -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')
lib/librte_eal/common/arch/x86/meson.build +1 -1
@@ -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')
lib/librte_eal/common/meson.build +2 -0
@@ -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',
Signature · 1 line
2.18.0
PATCH v2 2/4 build: use -Wno-error=format-security for Meson ifpga_rawdev build
This PMD is built with -Wno-format, which means GCC errors out if -Wformat-security is used.
---
v2: re-arranged flags
drivers/raw/ifpga_rawdev/base/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/raw/ifpga_rawdev/base/meson.build +2 -2
@@ -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
Signature · 1 line
2.18.0
Re: [PATCH v2 2/4] build: use -Wno-error=format-security for Meson ifpga_rawdev build
Quoted 6 lines · 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 <[email protected]>
PATCH v2 3/4 build: use -Wno-error=format-security for Meson i40e build
In reply to Luca BoccassiThis PMD is built with -Wno-format, which means GCC errors out if -Wformat-security is used.
---
v2: re-arranged flags
drivers/net/i40e/base/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/i40e/base/meson.build +2 -2
@@ -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
Signature · 1 line
2.18.0
Re: [PATCH v2 3/4] build: use -Wno-error=format-security for Meson i40e build
Quoted 6 lines · 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 <[email protected]>
PATCH v2 4/4 build: install igb_uio kernel module when building with Meson
In reply to Luca BoccassiInstall 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.
---
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(-)
kernel/linux/igb_uio/meson.build +2 -0
@@ -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'))
meson_options.txt +1 -1
@@ -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',
Signature · 1 line
2.18.0
Re: [PATCH v2 4/4] build: install igb_uio kernel module when building with Meson
Quoted 8 lines · 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 <[email protected]>---
Quoted 5 lines · 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 <[email protected]>
31/08/2018 13:00, Bruce Richardson:
Quoted 8 lines · Luca Boccassi
Quoted 5 lines
They are built by the legacy makefiles but not by Meson.
Fixes 8f40ee0734c8 ("eal/x86: get hypervisor name")Signed-off-by Luca Boccassi <[email protected]>Acked-by Bruce Richardson <[email protected]>
Should we add "Cc: [email protected]" for the whole series?
Quoted 4 lines · Thomas Monjalon
31/08/2018 13:00, Bruce Richardson:
Quoted 3 lines · Luca Boccassi
Quoted 2 lines
They are built by the legacy makefiles but not by Meson.
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
Fixes 8f40ee0734c8 ("eal/x86: get hypervisor name")Signed-off-by Luca Boccassi <[email protected]>Acked-by Bruce Richardson <[email protected]>Should we add "Cc: [email protected]" for the whole series?
Yes, it wouldn't hurt to do so.
Quoted 7 lines · Bruce Richardson
Quoted 6 lines · Thomas Monjalon
31/08/2018 13:00, Bruce Richardson:
Quoted 5 lines · Luca Boccassi
Quoted 4 lines
They are built by the legacy makefiles but not by Meson.
Fixes 8f40ee0734c8 ("eal/x86: get hypervisor name")
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Luca Boccassi <[email protected]>Acked-by Bruce Richardson <[email protected]>Should we add "Cc: [email protected]" for the whole series?
Yes, it wouldn't hurt to do so.
Done in v3, thanks
Signature · 2 lines
Kind regards, Luca Boccassi
PATCH v3 1/4 build: include missing hypervisor files in Meson build
In reply to Luca BoccassiThey are built by the legacy makefiles but not by Meson.
---
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(-)
lib/librte_eal/common/arch/arm/meson.build +1 -1
@@ -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')
lib/librte_eal/common/arch/x86/meson.build +1 -1
@@ -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')
lib/librte_eal/common/meson.build +2 -0
@@ -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',
Signature · 1 line
2.18.0
PATCH v3 2/4 build: use -Wno-error=format-security for Meson ifpga_rawdev build
This PMD is built with -Wno-format, which means GCC errors out if -Wformat-security is used.
---
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(-)
drivers/raw/ifpga_rawdev/base/meson.build +2 -2
@@ -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
Signature · 1 line
2.18.0
PATCH v3 3/4 build: use -Wno-error=format-security for Meson i40e build
In reply to Luca BoccassiThis PMD is built with -Wno-format, which means GCC errors out if -Wformat-security is used.
---
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(-)
drivers/net/i40e/base/meson.build +2 -2
@@ -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
Signature · 1 line
2.18.0
PATCH v3 4/4 build: install igb_uio kernel module when building with Meson
In reply to Luca BoccassiInstall 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.
---
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(-)
kernel/linux/igb_uio/meson.build +2 -0
@@ -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'))
meson_options.txt +1 -1
@@ -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',
Signature · 1 line
2.18.0
17/09/2018 11:01, Luca Boccassi:
Quoted 7 lines
They are built by the legacy makefiles but not by Meson.
Fixes 8f40ee0734c8 ("eal/x86: get hypervisor name")Signed-off-by Luca Boccassi <[email protected]>Acked-by Bruce Richardson <[email protected]>
Series applied, thanks