diff --git a/lib/functions/cli/cli-requirements.sh b/lib/functions/cli/cli-requirements.sh index fe848a7a5..1a4e93e46 100644 --- a/lib/functions/cli/cli-requirements.sh +++ b/lib/functions/cli/cli-requirements.sh @@ -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" } diff --git a/lib/functions/cli/commands.sh b/lib/functions/cli/commands.sh index 9b2700e7d..16164c7b2 100644 --- a/lib/functions/cli/commands.sh +++ b/lib/functions/cli/commands.sh @@ -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'" diff --git a/lib/functions/host/docker.sh b/lib/functions/host/docker.sh index 27b7cfca4..aada2615e 100755 --- a/lib/functions/host/docker.sh +++ b/lib/functions/host/docker.sh @@ -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" ############################################################################################################# diff --git a/lib/functions/host/prepare-host.sh b/lib/functions/host/prepare-host.sh index 7fbebaf5c..482c340af 100644 --- a/lib/functions/host/prepare-host.sh +++ b/lib/functions/host/prepare-host.sh @@ -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.