From ae33b7b9573e0d152dafa3cdc1d02882a778dee3 Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Thu, 20 Jul 2017 22:58:02 -0400 Subject: Move libreboot_setup_include() (for symmetry) --- libreboot | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/libreboot b/libreboot index 45d2fb86..1363e880 100755 --- a/libreboot +++ b/libreboot @@ -137,6 +137,22 @@ libreboot_setup() { libreboot_setup_variables } +libreboot_setup_include() { + local libs_path="${root}/libs" + local conf_path + + source "${libs_path}/project" + source "${libs_path}/tool" + source "${libs_path}/common" + source "${libs_path}/git" + + conf_path="${root}/${BUILD_SYSTEM}.conf" + + if [[ -f "${conf_path}" ]]; then + source "${conf_path}" + fi +} + libreboot_setup_tool_actions() { local -i tool_actions_count="${#TOOL_ACTIONS_GENERIC[@]}" local -a tool_actions @@ -167,22 +183,6 @@ libreboot_setup_project_actions() { PROJECT_ACTIONS=("${PROJECT_ACTIONS_HELPERS[@]}" "${project_actions[@]}") } -libreboot_setup_include() { - local libs_path="${root}/libs" - local conf_path - - source "${libs_path}/project" - source "${libs_path}/tool" - source "${libs_path}/common" - source "${libs_path}/git" - - conf_path="${root}/${BUILD_SYSTEM}.conf" - - if [[ -f "${conf_path}" ]]; then - source "${conf_path}" - fi -} - libreboot_setup_variables() { local vboot_tools_path="$(project_install_path 'vboot' 'tools')" local version_path="${root}/${DOTVERSION}" -- cgit v1.2.3-70-g09d2