mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
kernel: get better rid of KERNEL_CONFIGURE, remove UI asking for it, it's now a separate command kernel-config and wouldn't work anyway
This commit is contained in:
committed by
igorpecovnik
parent
bc5329ec84
commit
6ef394d95d
@@ -230,7 +230,7 @@ function obtain_complete_artifact() {
|
|||||||
# @TODO: if deploying to remote cache, force high compression, DEB_COMPRESS="xz"
|
# @TODO: if deploying to remote cache, force high compression, DEB_COMPRESS="xz"
|
||||||
artifact_build_from_sources # definitely will end up having its own logging sections
|
artifact_build_from_sources # definitely will end up having its own logging sections
|
||||||
|
|
||||||
# For cases like CREATE_PATCHES=yes or KERNEL_CONFIGURE=yes, we wanna stop here. No artifact file will be created.
|
# For interactive stuff like patching or configuring, we wanna stop here. No artifact file will be created.
|
||||||
if [[ "${ARTIFACT_WILL_NOT_BUILD}" == "yes" ]]; then
|
if [[ "${ARTIFACT_WILL_NOT_BUILD}" == "yes" ]]; then
|
||||||
display_alert "artifact" "ARTIFACT_WILL_NOT_BUILD is set, stopping after non-build." "debug"
|
display_alert "artifact" "ARTIFACT_WILL_NOT_BUILD is set, stopping after non-build." "debug"
|
||||||
return 0
|
return 0
|
||||||
|
|||||||
@@ -32,7 +32,6 @@ function cli_patch_kernel_run() {
|
|||||||
declare -g GIT_ARCHEOLOGY=yes # do archeology
|
declare -g GIT_ARCHEOLOGY=yes # do archeology
|
||||||
declare -g FAST_ARCHEOLOGY=yes # do archeology, but only for the exact path we need.
|
declare -g FAST_ARCHEOLOGY=yes # do archeology, but only for the exact path we need.
|
||||||
#declare -g REWRITE_PATCHES=yes # rewrite the patches after git commiting. Very cheap compared to the rest.
|
#declare -g REWRITE_PATCHES=yes # rewrite the patches after git commiting. Very cheap compared to the rest.
|
||||||
declare -g KERNEL_CONFIGURE=no # no menuconfig
|
|
||||||
declare -g RELEASE=jammy # or whatever, not relevant, just fool the configuration
|
declare -g RELEASE=jammy # or whatever, not relevant, just fool the configuration
|
||||||
declare -g SHOW_LOG=yes # show the log
|
declare -g SHOW_LOG=yes # show the log
|
||||||
prep_conf_main_build_single
|
prep_conf_main_build_single
|
||||||
|
|||||||
@@ -41,21 +41,6 @@ function interactive_finish() {
|
|||||||
unset SHOW_WARNING
|
unset SHOW_WARNING
|
||||||
}
|
}
|
||||||
|
|
||||||
function interactive_config_ask_kernel() {
|
|
||||||
interactive_config_ask_kernel_configure
|
|
||||||
}
|
|
||||||
|
|
||||||
function interactive_config_ask_kernel_configure() {
|
|
||||||
[[ -n ${KERNEL_CONFIGURE} ]] && return 0
|
|
||||||
options+=("no" "Do not change the kernel configuration")
|
|
||||||
options+=("yes" "Show a kernel configuration menu before compilation")
|
|
||||||
#options+=("prebuilt" "Use precompiled packages (maintained hardware only)") # @TODO armbian-next does not support this, I think.
|
|
||||||
dialog_if_terminal_set_vars --title "Choose an option" --backtitle "$backtitle" --no-tags --menu "Select the kernel configuration" $TTY_Y $TTY_X $((TTY_Y - 8)) "${options[@]}"
|
|
||||||
set_interactive_config_value KERNEL_CONFIGURE "${DIALOG_RESULT}"
|
|
||||||
[[ ${DIALOG_EXIT_CODE} != 0 ]] && exit_with_error "You cancelled interactive during kernel configuration" "Build cancelled"
|
|
||||||
unset options
|
|
||||||
}
|
|
||||||
|
|
||||||
# Required usage:
|
# Required usage:
|
||||||
# declare -a arr_all_board_names=() arr_all_board_options=() # arrays
|
# declare -a arr_all_board_names=() arr_all_board_options=() # arrays
|
||||||
# declare -A dict_all_board_types=() dict_all_board_source_files=() dict_all_board_descriptions=() # dictionaries
|
# declare -A dict_all_board_types=() dict_all_board_source_files=() dict_all_board_descriptions=() # dictionaries
|
||||||
|
|||||||
@@ -7,11 +7,8 @@
|
|||||||
# This file is a part of the Armbian Build Framework
|
# This file is a part of the Armbian Build Framework
|
||||||
# https://github.com/armbian/build/
|
# https://github.com/armbian/build/
|
||||||
|
|
||||||
function config_possibly_interactive_kernel_board() {
|
function config_possibly_interactive_board() {
|
||||||
# if KERNEL_CONFIGURE, BOARD, BRANCH or RELEASE are not set, display selection menu
|
# if BOARD is not set, display selection menu
|
||||||
|
|
||||||
interactive_config_ask_kernel
|
|
||||||
[[ -z $KERNEL_CONFIGURE ]] && exit_with_error "No option selected: KERNEL_CONFIGURE"
|
|
||||||
|
|
||||||
interactive_config_ask_board_list # this uses get_list_of_all_buildable_boards
|
interactive_config_ask_board_list # this uses get_list_of_all_buildable_boards
|
||||||
[[ -z $BOARD ]] && exit_with_error "No board selected: BOARD"
|
[[ -z $BOARD ]] && exit_with_error "No board selected: BOARD"
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ function prep_conf_main_build_single() {
|
|||||||
|
|
||||||
# those are possibly interactive. interactive (dialog) and logging don't mix, for obvious reasons.
|
# those are possibly interactive. interactive (dialog) and logging don't mix, for obvious reasons.
|
||||||
interactive_config_prepare_terminal # init vars used for interactive
|
interactive_config_prepare_terminal # init vars used for interactive
|
||||||
config_possibly_interactive_kernel_board
|
config_possibly_interactive_board
|
||||||
|
|
||||||
LOG_SECTION="config_source_board_file" do_with_conditional_logging config_source_board_file
|
LOG_SECTION="config_source_board_file" do_with_conditional_logging config_source_board_file
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user