From 42b67e740d2680758a3951723373c99e37aa95a0 Mon Sep 17 00:00:00 2001
From: gsell <achim.gsell@psi.ch>
Date: Thu, 28 Nov 2024 14:44:40 +0100
Subject: [PATCH] build-system: select modulefile from config

(cherry picked from commit b647a11a4f24626510a441b86f66fd4c1853607d)

Co-authored-by: Achim Gsell <achim.gsell@psi.ch>
---
 Pmodules/libpbuild.bash | 4 +++-
 Pmodules/modbuild.in    | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Pmodules/libpbuild.bash b/Pmodules/libpbuild.bash
index c59bf07..484f4c7 100644
--- a/Pmodules/libpbuild.bash
+++ b/Pmodules/libpbuild.bash
@@ -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}:" \
diff --git a/Pmodules/modbuild.in b/Pmodules/modbuild.in
index 3ffe7a4..a5384c6 100644
--- a/Pmodules/modbuild.in
+++ b/Pmodules/modbuild.in
@@ -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}"
 					;;