mirror of
https://github.com/Pmodules/Pmodules.git
synced 2026-08-06 11:22:26 +02:00
build-system: bugfix in checking variant
This commit is contained in:
+12
-8
@@ -1273,19 +1273,23 @@ build_modules_yaml_v1(){
|
|||||||
}
|
}
|
||||||
|
|
||||||
check_variant(){
|
check_variant(){
|
||||||
|
# if a variant is neither passed as argument nor a default,
|
||||||
|
# is defined, therefore let's build this variant.
|
||||||
local -- build_variant="${opt_variant:-${config['default_variant']}}"
|
local -- build_variant="${opt_variant:-${config['default_variant']}}"
|
||||||
# don't build if a variant has be specified on the command line or
|
[[ -z "${build_variant}" ]] && return 0
|
||||||
# a default variant has been set in the config file, but no
|
|
||||||
# variant name is defined here
|
# a variant has been passed as argument or a default variant is
|
||||||
[[ -n ${build_variant} && -z ${config['variant']} ]] && return 1
|
# defined. If this variant is not named, we don't build it.
|
||||||
[[ -z ${config['variant']} ]] && return 1
|
[[ -z ${config['variant']} ]] && return 1
|
||||||
|
|
||||||
set -o noglob
|
set -o noglob
|
||||||
local -a items=( "${config['variant'],,}" )
|
local -a variants=( "${config['variant'],,}" )
|
||||||
set +o noglob
|
set +o noglob
|
||||||
local item=''
|
local variant=''
|
||||||
for item in "${items[@]}"; do
|
for variant in "${variants[@]}"; do
|
||||||
[[ "${opt_variant}" == "${item}" ]] && return 0
|
[[ "${build_variant}" == "${variant}" ]] && return 0
|
||||||
done
|
done
|
||||||
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
check_kernel module_config || return 1
|
check_kernel module_config || return 1
|
||||||
|
|||||||
Reference in New Issue
Block a user