enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

armbian-next: remove usage of REQUIREMENTS_DEFS_ONLY; initialize extensions for requirements cli command & docker pre-game deps

Browse Source
This commit is contained in:
Ricardo Pardini 2022-10-28 21:45:10 +02:00
parent bc7d388b49
commit 75de1c2d82
No known key found for this signature in database
GPG Key ID: 3D38CA12A66C5D02
4 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/functions/cli/cli-requirements.sh
View File

@ -15,8 +15,9 @@ function cli_requirements_pre_run() {
}
function cli_requirements_run() {
initialize_extension_manager # initialize the extension manager.
declare -a -g host_dependencies=()
early_prepare_host_dependencies # tests itself for REQUIREMENTS_DEFS_ONLY=yes too
early_prepare_host_dependencies
LOG_SECTION="install_host_dependencies" do_with_logging install_host_dependencies "for requirements command"
display_alert "Done with" "@host dependencies" "cachehit"
}

2
lib/functions/cli/commands.sh
View File

@ -29,8 +29,6 @@ function armbian_register_commands() {
["generate-dockerfile"]="DOCKERFILE_GENERATE_ONLY='yes'"
["requirements"]="REQUIREMENTS_DEFS_ONLY='yes'"
["config-dump"]="CONFIG_DEFS_ONLY='yes'"
["configdump"]="CONFIG_DEFS_ONLY='yes'"

3
lib/functions/host/docker.sh
View File

@ -109,8 +109,9 @@ function docker_cli_prepare() {
#############################################################################################################
# Prepare some dependencies; these will be used on the Dockerfile
initialize_extension_manager # initialize the extension manager.
declare -a -g host_dependencies=()
REQUIREMENTS_DEFS_ONLY=yes early_prepare_host_dependencies
early_prepare_host_dependencies
display_alert "Pre-game dependencies" "${host_dependencies[*]}" "debug"
#############################################################################################################

10
lib/functions/host/prepare-host.sh
View File

@ -260,11 +260,6 @@ function early_prepare_host_dependencies() {
host_dependencies+=("apt-cacher-ng")
fi
if [[ "${REQUIREMENTS_DEFS_ONLY}" == "yes" ]]; then
display_alert "Not calling add_host_dependencies nor host_dependencies_known" "due to REQUIREMENTS_DEFS_ONLY" "debug"
return 0
fi
export EXTRA_BUILD_DEPS=""
call_extension_method "add_host_dependencies" <<- 'ADD_HOST_DEPENDENCIES'
*run before installing host dependencies*
@ -301,11 +296,6 @@ function install_host_dependencies() {
export FINAL_HOST_DEPS="${host_dependencies[*]}"
if [[ "${REQUIREMENTS_DEFS_ONLY}" == "yes" ]]; then
display_alert "Not calling host_dependencies_ready" "due to REQUIREMENTS_DEFS_ONLY" "debug"
return 0
fi
call_extension_method "host_dependencies_ready" <<- 'HOST_DEPENDENCIES_READY'
*run after all host dependencies are installed*
At this point we can read `${FINAL_HOST_DEPS}`, but changing won't have any effect.