[v3,2/2] build: fix option ordering

Message ID 20190207155318.12579-2-3chas3@gmail.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series [v3,1/2] build: add option to override max ethports |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Chas Williams Feb. 7, 2019, 3:53 p.m. UTC
  Sort the options alphabetically and make a note of the preferred
order at the top of the file.

Signed-off-by: Chas Williams <3chas3@gmail.com>
---
 meson_options.txt | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
  

Comments

Bruce Richardson Feb. 7, 2019, 4:35 p.m. UTC | #1
On Thu, Feb 07, 2019 at 10:53:18AM -0500, Chas Williams wrote:
> Sort the options alphabetically and make a note of the preferred
> order at the top of the file.
> 
> Signed-off-by: Chas Williams <3chas3@gmail.com>
> ---
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
  
Thomas Monjalon Feb. 26, 2019, 8:31 p.m. UTC | #2
07/02/2019 17:35, Bruce Richardson:
> On Thu, Feb 07, 2019 at 10:53:18AM -0500, Chas Williams wrote:
> > Sort the options alphabetically and make a note of the preferred
> > order at the top of the file.
> > 
> > Signed-off-by: Chas Williams <3chas3@gmail.com>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>

Series applied with a small fix in the meson description.
  

Patch

diff --git a/meson_options.txt b/meson_options.txt
index 5bae08bb3..c6454fe29 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,15 +1,17 @@ 
+# Please keep these options sorted alphabetically.
+
 option('allow_invalid_socket_id', type: 'boolean', value: false,
 	description: 'allow out-of-range NUMA socket id\'s for platforms that don\'t report the value correctly')
 option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-<VERSION>',
 	description: 'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.')
-option('ibverbs_link', type: 'combo', choices : ['shared', 'dlopen'], value: 'shared',
-	description: 'Linkage method (shared/dlopen) for Mellanox PMDs with ibverbs dependencies.')
-option('enable_kmods', type: 'boolean', value: true,
-	description: 'build kernel modules')
 option('enable_docs', type: 'boolean', value: false,
 	description: 'build documentation')
+option('enable_kmods', type: 'boolean', value: true,
+	description: 'build kernel modules')
 option('examples', type: 'string', value: '',
 	description: 'Comma-separated list of examples to build by default')
+option('ibverbs_link', type: 'combo', choices : ['shared', 'dlopen'], value: 'shared',
+	description: 'Linkage method (shared/dlopen) for Mellanox PMDs with ibverbs dependencies.')
 option('include_subdir_arch', type: 'string', value: '',
 	description: 'subdirectory where to install arch-dependent headers')
 option('kernel_dir', type: 'string', value: '',
@@ -26,7 +28,7 @@  option('max_numa_nodes', type: 'string', value: '4',
 	description: 'maximum number of NUMA nodes supported by EAL')
 option('per_library_versions', type: 'boolean', value: true,
 	description: 'true: each lib gets its own version number, false: DPDK version used for each lib')
-option('use_hpet', type: 'boolean', value: false,
-	description: 'use HPET timer in EAL')
 option('tests', type: 'boolean', value: true,
 	description: 'build unit tests')
+option('use_hpet', type: 'boolean', value: false,
+	description: 'use HPET timer in EAL')