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-oleg: curb Python launcher logs

Browse Source
This commit is contained in:
Ricardo Pardini
2023-01-12 14:22:07 +01:00
parent 95ffd76b3b
commit 2c0c968645
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/functions/compilation/kernel-patching.sh
View File

@@ -46,7 +46,9 @@ function kernel_main_patching_python() {
display_alert "Calling Python patching script" "for kernel" "info"
declare python3_binary_path
prepare_python3_binary_for_python_tools
run_host_command_logged env -i "${params_quoted[@]@Q}" "${python3_binary_path}" "${SRC}/lib/tools/patching.py"
# "raw_command" is only for logging purposes.
raw_command="[...shortened kernel...] ${python3_binary_path} ${SRC}/lib/tools/patching.py" \
run_host_command_logged env -i "${params_quoted[@]@Q}" "${python3_binary_path}" "${SRC}/lib/tools/patching.py"
run_host_command_logged cat "${temp_file_for_output}"
# shellcheck disable=SC1090
source "${temp_file_for_output}" # SOURCE IT!

4
lib/functions/compilation/uboot-patching.sh
View File

@@ -32,7 +32,9 @@ function uboot_main_patching_python() {
display_alert "Calling Python patching script" "for u-boot target" "info"
declare python3_binary_path
prepare_python3_binary_for_python_tools
run_host_command_logged env -i "${params_quoted[@]@Q}" "${python3_binary_path}" "${SRC}/lib/tools/patching.py"
# "raw_command" is only for logging purposes.
raw_command="[...shortened u-boot...] ${python3_binary_path} ${SRC}/lib/tools/patching.py" \
run_host_command_logged env -i "${params_quoted[@]@Q}" "${python3_binary_path}" "${SRC}/lib/tools/patching.py"
run_host_command_logged cat "${temp_file_for_output}"
# shellcheck disable=SC1090
source "${temp_file_for_output}" # SOURCE IT!

4
lib/functions/configuration/aggregation.sh
View File

@@ -74,7 +74,9 @@ function aggregate_all_packages_python() {
)
declare python3_binary_path
prepare_python3_binary_for_python_tools
run_host_command_logged env -i "${aggregation_params_quoted[@]@Q}" "${python3_binary_path}" "${SRC}/lib/tools/aggregation.py"
# "raw_command" is only for logging purposes.
raw_command="[...shortened...] ${python3_binary_path} ${SRC}/lib/tools/aggregation.py" \
run_host_command_logged env -i "${aggregation_params_quoted[@]@Q}" "${python3_binary_path}" "${SRC}/lib/tools/aggregation.py"
#run_host_command_logged cat "${temp_file_for_aggregation}"
# shellcheck disable=SC1090
source "${temp_file_for_aggregation}" # SOURCE IT!

2
lib/functions/logging/runners.sh
View File

@@ -183,7 +183,7 @@ function run_host_x86_binary_logged() {
# run_host_command_logged is the very basic, should be used for everything, but, please use helpers above, this is very low-level.
function run_host_command_logged() {
raw_command="$*" run_host_command_logged_raw /bin/bash -e -o pipefail -c "$*"
raw_command="${raw_command:-"$*"}" run_host_command_logged_raw /bin/bash -e -o pipefail -c "$*"
}
# for interactive, dialog-like host-side invocations. no redirections performed, but same bash usage and expansion, for consistency.