From da1cf2b475323b8cd0c5068fe219af3aedf703fc Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Wed, 18 Jan 2023 22:39:35 +0100 Subject: [PATCH] armbian-next: rename too-long main function to `prep_conf_main_build_single()` - this commit is proof of OCD (old name didn't fit stacktrace space) --- lib/functions/cli/cli-build.sh | 2 +- lib/functions/cli/cli-configdump.sh | 2 +- lib/functions/cli/cli-patch.sh | 2 +- lib/functions/host/prepare-host.sh | 2 +- lib/functions/main/config-prepare.sh | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/functions/cli/cli-build.sh b/lib/functions/cli/cli-build.sh index 8c36672afe..77edf04139 100644 --- a/lib/functions/cli/cli-build.sh +++ b/lib/functions/cli/cli-build.sh @@ -7,7 +7,7 @@ function cli_standard_build_pre_run() { function cli_standard_build_run() { # configuration etc - it initializes the extension manager; handles its own logging sections - prepare_and_config_main_build_single + prep_conf_main_build_single # main_default_build_single() handles its own logging sections... main_default_build_single diff --git a/lib/functions/cli/cli-configdump.sh b/lib/functions/cli/cli-configdump.sh index 15fec0d68d..cf7a243465 100644 --- a/lib/functions/cli/cli-configdump.sh +++ b/lib/functions/cli/cli-configdump.sh @@ -9,7 +9,7 @@ function cli_config_dump_run() { } function config_and_remove_useless() { - do_logging=no prepare_and_config_main_build_single # avoid logging during configdump; it's useless + do_logging=no prep_conf_main_build_single # avoid logging during configdump; it's useless unset FINALDEST unset HOOK_ORDER HOOK_POINT HOOK_POINT_TOTAL_FUNCS unset REPO_CONFIG REPO_STORAGE diff --git a/lib/functions/cli/cli-patch.sh b/lib/functions/cli/cli-patch.sh index e461a43d42..2fb54330a4 100644 --- a/lib/functions/cli/cli-patch.sh +++ b/lib/functions/cli/cli-patch.sh @@ -18,7 +18,7 @@ function cli_patch_kernel_run() { declare -g KERNEL_CONFIGURE=no # no menuconfig declare -g RELEASE=jammy # or whatever, not relevant, just fool the configuration declare -g SHOW_LOG=yes # show the log - prepare_and_config_main_build_single + prep_conf_main_build_single declare ymd vendor_lc target_repo_url summary_url ymd="$(date +%Y%m%d)" diff --git a/lib/functions/host/prepare-host.sh b/lib/functions/host/prepare-host.sh index 2de4dcb99b..a8aa8a8aee 100644 --- a/lib/functions/host/prepare-host.sh +++ b/lib/functions/host/prepare-host.sh @@ -6,7 +6,7 @@ # * changes system settings # function prepare_host() { - # Now, if NOT interactive, do some basic checks. If interactive, those have already run back in prepare_and_config_main_build_single() + # Now, if NOT interactive, do some basic checks. If interactive, those have already run back in prep_conf_main_build_single() if [[ ! -t 1 ]]; then LOG_SECTION="ni_check_basic_host" do_with_logging check_basic_host fi diff --git a/lib/functions/main/config-prepare.sh b/lib/functions/main/config-prepare.sh index b7be2022ae..620cb30da9 100644 --- a/lib/functions/main/config-prepare.sh +++ b/lib/functions/main/config-prepare.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -function prepare_and_config_main_build_single() { +function prep_conf_main_build_single() { LOG_SECTION="config_early_init" do_with_conditional_logging config_early_init # if interactive, call prepare-host.sh::check_basic_host() early, to avoid disappointments later. @@ -26,7 +26,7 @@ function prepare_and_config_main_build_single() { LOG_SECTION="do_extra_configuration" do_with_conditional_logging do_extra_configuration LOG_SECTION="config_post_main" do_with_conditional_logging config_post_main - display_alert "Done with prepare_and_config_main_build_single" "${BOARD}.${BOARD_TYPE}" "info" + display_alert "Done with prep_conf_main_build_single" "${BOARD}.${BOARD_TYPE}" "info" } function config_source_board_file() {