From bfc83c02d0b2b63327068fb0a72d97021352f03e Mon Sep 17 00:00:00 2001 From: gsell Date: Wed, 11 Sep 2024 10:37:14 +0200 Subject: [PATCH] Merge branch '359-build-system-default-build-function-are-not-defined' into 'master' Resolve "build-system: default build function are not defined" Closes #359 See merge request Pmodules/src!365 (cherry picked from commit 877906a73a7c8a3debfad17be2b46794f2b302dd) d370780e build-system: define build functions in default config Co-authored-by: gsell --- Pmodules/modbuild.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Pmodules/modbuild.in b/Pmodules/modbuild.in index a962bbb..fbc9799 100644 --- a/Pmodules/modbuild.in +++ b/Pmodules/modbuild.in @@ -540,6 +540,10 @@ declare -A Yaml_default_config=( ['use_flags']='' # !!seq ['use_overlays']='' # !!seq ['variant']='' # !!str + ['target_funcs:prep']='pbuild::pre_prep pbuild::prep pbuild::post_prep' + ['target_funcs:configure']='pbuild::pre_configure pbuild::configure pbuild::post_configure' + ['target_funcs:compile']='pbuild::pre_compile pbuild::compile pbuild::post_compile' + ['target_funcs:install']='pbuild::pre_install pbuild::install pbuild::post_install' ) declare -A Yaml_valid_vk_keys=( @@ -661,9 +665,6 @@ build_modules_yaml_v1(){ get_build_functions(){ local -n yaml_in="$1" local -a keys=() - for key in 'prep' 'configure' 'compile' 'install'; do - cfg[target_funcs:${key}]="pbuild::pre_${key} pbuild::${key} pbuild::post_${key}" - done readarray -t keys < <( ${yq} -e ".|keys().[]" \ <<<"${yaml_in}" \ 2>/dev/null ) || \