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_env.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_env.subr')
| -rw-r--r-- | subr/ex_pkg_env.subr | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/subr/ex_pkg_env.subr b/subr/ex_pkg_env.subr index bc4f9ce2..cbfb6ecd 100644 --- a/subr/ex_pkg_env.subr +++ b/subr/ex_pkg_env.subr @@ -3,41 +3,41 @@ # exp_pkg_env_source() { - local _pkg_name="${1}" _tgt_name="${2}" \ - _tgt_name_uc="" _pkg_name_uc="" _pkg_name_inherit_uc="" \ + local _group_name="${1}" _pkg_name="${2}" \ + _group_name_uc="" _pkg_name_uc="" _pkg_name_inherit_uc="" \ _build_type_uc="" _vname_dst="" _vars_set=""; ex_rtl_fileop source_opt "vars/${_pkg_name}.vars"; - _tgt_name_uc="$(ex_rtl_toupper "${_tgt_name}")"; + _group_name_uc="$(ex_rtl_toupper "${_group_name}")"; _pkg_name_uc="$(ex_rtl_toupper "${_pkg_name}")"; - ex_rtl_set_vars BUILD_TYPE \ - "DEFAULT ${_tgt_name_uc} PKG_${_pkg_name_uc}" \ + ex_rtl_set_vars BUILD_TYPE \ + "DEFAULT ${_group_name_uc} PKG_${_pkg_name_uc}" \ _vars_set; _build_type_uc="$(ex_rtl_toupper "${PKG_BUILD_TYPE}")"; ex_rtl_set_vars INHERIT_FROM "PKG_${_pkg_name_uc}" _vars_set; _pkg_name_inherit_uc="$(ex_rtl_toupper "${PKG_INHERIT_FROM}")"; - for _vname_dst in $(ex_rtl_lfilter_not \ + for _vname_dst in $(ex_rtl_lfilter_not \ "${DEFAULT_BUILD_VARS}" BUILD_TYPE); do if [ -n "${_pkg_name_inherit_uc}" ]; then - ex_rtl_set_vars "${_vname_dst}" \ - "DEFAULT DEFAULT_${_build_type_uc} \ - ${_tgt_name_uc} \ - PKG_${_pkg_name_inherit_uc} \ + ex_rtl_set_vars "${_vname_dst}" \ + "DEFAULT DEFAULT_${_build_type_uc} \ + ${_group_name_uc} \ + PKG_${_pkg_name_inherit_uc} \ PKG_${_pkg_name_uc}" _vars_set; else - ex_rtl_set_vars "${_vname_dst}" \ - "DEFAULT DEFAULT_${_build_type_uc} \ - ${_tgt_name_uc} PKG_${_pkg_name_uc}" \ + ex_rtl_set_vars "${_vname_dst}" \ + "DEFAULT DEFAULT_${_build_type_uc} \ + ${_group_name_uc} PKG_${_pkg_name_uc}" \ _vars_set; fi; done; - ex_rtl_unset_vars $(ex_rtl_lfilter_not \ - "$(set | awk -F= '/^PKG_/{print $1}' | sort)" \ + ex_rtl_unset_vars $(ex_rtl_lfilter_not \ + "$(set | awk -F= '/^PKG_/{print $1}' | sort)" \ "${_vars_set}"); }; ex_pkg_env() { - local _pkg_name="${1}" _tgt_name="${2}" _restart_at="${3}" _vname=""; - exp_pkg_env_source "${_pkg_name}" "${_tgt_name}"; + local _group_name="${1}" _pkg_name="${2}" _restart_at="${3}" _vname=""; + exp_pkg_env_source "${_group_name}" "${_pkg_name}"; : ${PKG_NAME:="${_pkg_name}"}; : ${MIDIPIX_BUILD_PWD:="$(pwd)"}; : ${PKG_BASE_DIR:="${BUILD_WORKDIR}/${_pkg_name}-${PKG_BUILD_TYPE}-${PKG_TARGET}"}; |