diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-09 13:43:26 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-09 13:43:26 +0000 |
| commit | b96c60d7ebc4546e8e92ac68b12e614ac6bdd39d (patch) | |
| tree | 3ad48d44429860d03931468ed49ac4b46902fd56 /subr/ex_pkg_exec.subr | |
| parent | 65343f0d4b4840ada1186b8316d34cfa8ccc0713 (diff) | |
| download | midipix_build-b96c60d7ebc4546e8e92ac68b12e614ac6bdd39d.tar.bz2 midipix_build-b96c60d7ebc4546e8e92ac68b12e614ac6bdd39d.tar.xz | |
Rename build targets to build groups to avoid confusion w/ target architectures.
Diffstat (limited to 'subr/ex_pkg_exec.subr')
| -rw-r--r-- | subr/ex_pkg_exec.subr | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/subr/ex_pkg_exec.subr b/subr/ex_pkg_exec.subr index 7092dad3..0a87b450 100644 --- a/subr/ex_pkg_exec.subr +++ b/subr/ex_pkg_exec.subr @@ -3,12 +3,12 @@ # exp_pkg_exec_pre() { - local _pkg_name="${1}" _tgt_name="${2}" _restart_at="${3}"; + local _group_name="${1}" _pkg_name="${2}" _restart_at="${3}"; if [ -z "${PKG_URL}" ]\ && [ -z "${PKG_URLS_GIT}" ]\ && [ -z "${PKG_VERSION}" ]\ && ! ex_rtl_test_cmd "pkg_${_pkg_name}_all"; then - "${_dispatch_fn}" exec_missing "${_pkg_name}" "${_tgt_name}"; + "${_dispatch_fn}" exec_missing "${_group_name}" "${_pkg_name}"; return 1; elif ! ex_pkg_state_test "${_pkg_name}" "start" "${_restart_at}"; then if [ "${PKG_NO_CLEAN_BASE_DIR:-0}" -eq 0 ]; then @@ -22,16 +22,16 @@ exp_pkg_exec_pre() { }; ex_pkg_exec() { - local _pkg_name="${1}" _tgt_name="${2}" _restart_at="${3}" \ + local _group_name="${1}" _pkg_name="${2}" _restart_at="${3}" \ _step="" _step_cmd="" _step_cmd_pfx="" _step_rc=""; trap "if [ \${?} -eq 0 ]; then \ - echo \"done ${_pkg_name} ${_tgt_name}\" >&3; \ + echo \"done ${_group_name} ${_pkg_name}\" >&3; \ else \ - echo \"fail ${_pkg_name} ${_tgt_name}\" >&3; \ + echo \"fail ${_group_name} ${_pkg_name}\" >&3; \ pkill -U "${$}"; \ fi;" EXIT HUP INT TERM USR1 USR2; - exp_pkg_exec_pre "${_pkg_name}" "${_tgt_name}" "${_restart_at}"; - "${_dispatch_fn}" exec_start "${_pkg_name}" "${_tgt_name}"; + exp_pkg_exec_pre "${_group_name}" "${_pkg_name}" "${_restart_at}"; + "${_dispatch_fn}" exec_start "${_group_name}" "${_pkg_name}"; if ex_rtl_test_cmd "pkg_${_pkg_name}_all"; then "pkg_${_pkg_name}_all" "${_restart_at}"; else set -- ${PKG_BUILD_STEPS}; @@ -42,25 +42,25 @@ ex_pkg_exec() { continue; else ex_rtl_try_run \ "pkg_${_pkg_name}_${_step}_pre" \ - "${_pkg_name}" "${_tgt_name}" "${_restart_at}"; + "${_group_name}" "${_pkg_name}" "${_restart_at}"; if ex_rtl_test_cmd "pkg_${_pkg_name}_${_step}"; then ex_rtl_try_run "pkg_${_pkg_name}_${_step}" \ - "${_pkg_name}" "${_tgt_name}" "${_restart_at}"; + "${_group_name}" "${_pkg_name}" "${_restart_at}"; else ex_rtl_try_run "pkg_${_step}" \ - "${_pkg_name}" "${_tgt_name}" "${_restart_at}"; + "${_group_name}" "${_pkg_name}" "${_restart_at}"; fi; ex_rtl_try_run \ "pkg_${_pkg_name}_${_step}_post" \ - "${_pkg_name}" "${_tgt_name}" "${_restart_at}"; + "${_group_name}" "${_pkg_name}" "${_restart_at}"; fi; - echo "step ${_pkg_name} ${_tgt_name} ${_step}" >&3; - "${_dispatch_fn}" exec_step "${_pkg_name}" "${_tgt_name}" "${_step}"; + echo "step ${_group_name} ${_pkg_name} ${_step}" >&3; + "${_dispatch_fn}" exec_step "${_group_name}" "${_pkg_name}" "${_step}"; ex_pkg_state_set "${_pkg_name}" "${_step}" "${1:+-${1}}"; done; fi; - "${_dispatch_fn}" exec_finish "${_pkg_name}" "${_tgt_name}"; + "${_dispatch_fn}" exec_finish "${_group_name}" "${_pkg_name}"; ex_pkg_state_set "${_pkg_name}" finish; }; |