diff options
author | Andrew Robbins <contact@andrewrobbins.info> | 2017-07-20 22:58:02 -0400 |
---|---|---|
committer | Andrew Robbins <contact@andrewrobbins.info> | 2017-07-21 01:37:43 -0400 |
commit | ae33b7b9573e0d152dafa3cdc1d02882a778dee3 (patch) | |
tree | 0e313d59c437e99d6eb6718989f869cef9d0a3c2 | |
parent | 274b669e1a1f45d592f4765b609afb37e2e66e43 (diff) | |
download | librebootfr-ae33b7b9573e0d152dafa3cdc1d02882a778dee3.tar.gz librebootfr-ae33b7b9573e0d152dafa3cdc1d02882a778dee3.zip |
Move libreboot_setup_include() (for symmetry)
-rwxr-xr-x | libreboot | 32 |
1 files changed, 16 insertions, 16 deletions
@@ -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}" |