JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

armbian-next: further split of config-prepare() and do_main_configuration() into do_extra_configuration() - fixes interactive desktop

Browse Source
This commit is contained in:
Ricardo Pardini
2023-01-09 17:16:56 +01:00
parent 4307bac073
commit b380ba4d86
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/functions/configuration/main-config.sh
View File

@@ -9,6 +9,8 @@
# This file is a part of the Armbian build script
# https://github.com/armbian/build/
### Attention: we can't use any interactive programs, read from stdin, nor use non-coreutils utilities here.
function do_main_configuration() {
display_alert "Starting main configuration" "${MOUNT_UUID}" "info"
@@ -272,8 +274,10 @@ function do_main_configuration() {
declare -g -r PACKAGE_LIST_FAMILY="${PACKAGE_LIST_FAMILY}"
declare -g -r PACKAGE_LIST_FAMILY_REMOVE="${PACKAGE_LIST_FAMILY_REMOVE}"
interactive_desktop_main_configuration
display_alert "Done with do_main_configuration" "do_main_configuration" "debug"
}
function do_extra_configuration() {
[[ -n $ATFSOURCE && -z $ATF_USE_GCC ]] && exit_with_error "Error in configuration: ATF_USE_GCC is unset"
[[ -z $UBOOT_USE_GCC ]] && exit_with_error "Error in configuration: UBOOT_USE_GCC is unset"
[[ -z $KERNEL_USE_GCC ]] && exit_with_error "Error in configuration: KERNEL_USE_GCC is unset"
@@ -368,7 +372,7 @@ function do_main_configuration() {
# Give the option to configure DNS server used in the chroot during the build process
[[ -z $NAMESERVER ]] && NAMESERVER="1.0.0.1" # default is cloudflare alternate
display_alert "Done with main-config.sh" "do_main_configuration" "debug"
display_alert "Done with do_extra_configuration" "do_extra_configuration" "debug"
}
# This is called by main_default_build_single() but declared here for 'convenience'

8
lib/functions/main/config-prepare.sh
View File

@@ -10,10 +10,16 @@ function prepare_and_config_main_build_single() {
LOG_SECTION="config_source_board_file" do_with_conditional_logging config_source_board_file
config_possibly_interactive_branch_release_desktop_minimal
interactive_finish # cleans up vars used for interactive
LOG_SECTION="config_pre_main" do_with_conditional_logging config_pre_main
LOG_SECTION="do_main_configuration" do_with_conditional_logging do_main_configuration # This initializes the extension manager among a lot of other things, and call extension_prepare_config() hook
interactive_desktop_main_configuration
interactive_finish # cleans up vars used for interactive
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"
}