mirror of
https://github.com/Pmodules/Pmodules.git
synced 2026-06-27 10:03:08 +02:00
Merge branch 'cherry-pick-b647a11a' into '1.1.22'
build-system: select modulefile from config See merge request Pmodules/src!393
This commit is contained in:
@@ -1236,7 +1236,9 @@ _build_module() {
|
||||
}
|
||||
[[ "${is_subpkg}" == 'yes' ]] && return 0
|
||||
local src=''
|
||||
if ! find_modulefile src; then
|
||||
if [[ -n "${ModuleConfig['modulefile']}" ]]; then
|
||||
src="${ModuleConfig['modulefile']}"
|
||||
elif ! find_modulefile src; then
|
||||
std::info \
|
||||
"%s " \
|
||||
"${module_name}/${module_version}:" \
|
||||
|
||||
@@ -526,6 +526,7 @@ declare -A Yaml_default_config=(
|
||||
['group']='Tools' # !!str
|
||||
['group_deps']='' # !!map
|
||||
['kernels']='' # !!seq of strings
|
||||
['modulefile']='' # !!str
|
||||
['overlay']='base' # !!str
|
||||
['patch_files']='' # !!seq
|
||||
['patch_files+']='' # !!seq
|
||||
@@ -767,7 +768,7 @@ build_modules_yaml_v1(){
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
default_variant | download_dir | group | overlay | script | suffix )
|
||||
default_variant | download_dir | group | modulefile | overlay | script | suffix )
|
||||
pm::get_value "${yaml_input}" value "${key}" '!!str'
|
||||
cfg[${key,,}]="${value}"
|
||||
;;
|
||||
|
||||
Reference in New Issue
Block a user