Skip to content

Commit e943ec8

Browse files
committed
[fix] : Fixed an issue where some dependent modules were not loaded
1 parent 770362a commit e943ec8

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

build.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -455,23 +455,24 @@ prepare_build() {
455455

456456
local module dependent module_err module_check
457457
module_check(){
458-
msg_debug "Checking module ${1}..."
459458
if [[ ! "$(bash "${tools_dir}/module.sh" check "${1}")" = "correct" ]]; then
460459
msg_error "Module ${1} is not available." "1";
461460
fi
462461
}
463462
for module in ${modules[@]}; do
464463
module_check "${module}"
465-
while read -r dependent; do
466-
if [[ ! "${module}" = " " ]] || [[ ! "${module}" = "" ]] ; then continue; fi
464+
for dependent in $(bash "${tools_dir}/module.sh" depend "${module}"); do
467465
module_check "${dependent}"
468466
modules+=("${dependent}")
469-
done < <(bash "${tools_dir}/module.sh" depend "${module}" | tr " " "\n")
467+
done
470468
done
471469
modules=($(printf "%s\n" "${modules[@]}" | sort | uniq))
472470
for_module load_config "${module_dir}/{}/config.any" "${module_dir}/{}/config.${arch}"
473471
msg_debug "Loaded modules: ${modules[*]}"
474472
unset module i dependent
473+
if ! printf "%s\n" "${modules[@]}" | grep -x "share" >/dev/null 2>&1; then
474+
msg_warn "The share module is not loaded."
475+
fi
475476

476477
# Set kernel
477478
if [[ "${customized_kernel}" = false ]]; then

modules/share-extra/config.any

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)