diff options
author | Lucía Andrea Illanes Albornoz <lucia@luciaillanes.de> | 2023-03-13 14:18:14 +0100 |
---|---|---|
committer | Lucía Andrea Illanes Albornoz <lucia@luciaillanes.de> | 2023-03-13 14:18:14 +0100 |
commit | 1380599ef36e89818d74a5e8ee8edd75846a4b7c (patch) | |
tree | b6493f80d2c4784b55ab5bad8c57467b872b98a5 /subr.ex | |
parent | e94dc6d0cadb6703baced36ed82709146e80285b (diff) | |
download | midipix_build-1380599ef36e89818d74a5e8ee8edd75846a4b7c.tar.bz2 midipix_build-1380599ef36e89818d74a5e8ee8edd75846a4b7c.tar.xz |
Followup to <fd38dc025f5d31890abbf3d48c597114203b1421>.
Diffstat (limited to 'subr.ex')
-rw-r--r-- | subr.ex/ex_pkg.subr | 18 | ||||
-rw-r--r-- | subr.ex/ex_pkg_env.subr | 7 |
2 files changed, 9 insertions, 16 deletions
diff --git a/subr.ex/ex_pkg.subr b/subr.ex/ex_pkg.subr index 2babb92a..6e33f9be 100644 --- a/subr.ex/ex_pkg.subr +++ b/subr.ex/ex_pkg.subr @@ -80,16 +80,16 @@ ex_pkg_find_package() { # # ex_pkg_get_default() - get single package default value # @_rdefault: reference to out variable of default value or "" on end of list +# @_default_idx: one-based single default value index # @_pkg_name: single package name # @_pkg_version: single package version -# @_ldefault: SP-separated list of default value names (any of: patches, patches_chainport, patches_pre, vars_file) -# @_default_idx: one-based single default value index +# @_ldefault: SP-separated list of default value names (any of: patches, patches_pre, vars_file) # # Return: zero (0) on success, non-zero (>0) on invalid default value name or unknown package. # ex_pkg_get_default() { - local _epgd_rdefault="${1#\$}" _epgd_pkg_name="${2}" _epgd_pkg_version="${3}" \ - _epgd_ldefault="${4}" _epgd_default_idx="${5}" \ + local _epgd_rdefault="${1#\$}" _epgd_default_idx="${2}" _epgd_pkg_name="${3}" \ + _epgd_pkg_version="${4}" _epgd_ldefault="${5}" \ _epgd_default="" _epgd_patch_fname="" _epgd_pkg_name_full="" \ _epgd_pkg_patches_extra="" _epgd_rc=0; @@ -100,7 +100,7 @@ ex_pkg_get_default() { for _epgd_default in ${_epgd_ldefault}; do case "${_epgd_default}" in patches) - rtl_get_var_unsafe \$_epgd_pkg_patches_extra -u "${_epgd_pkg_name}_PATCHES_EXTRA"; + rtl_get_var_unsafe \$_epgd_pkg_patches_extra -u "PKG_${_epgd_pkg_name}_PATCHES_EXTRA"; set +o noglob; set -- \ "${@}" \ @@ -111,14 +111,6 @@ ex_pkg_get_default() { set -o noglob; ;; - patches_chainport) - if [ "${_epgd_pkg_version:+1}" = 1 ]; then - set -- \ - "${@}" \ - "${BUILD_WORKDIR}/chainport/patches/${_epgd_pkg_name%%_*}/${_epgd_pkg_name%%_*}-${_epgd_pkg_version}.midipix.patch"; - fi; - ;; - patches_pre) set -- \ "${@}" \ diff --git a/subr.ex/ex_pkg_env.subr b/subr.ex/ex_pkg_env.subr index d6e8b803..f7ed3552 100644 --- a/subr.ex/ex_pkg_env.subr +++ b/subr.ex/ex_pkg_env.subr @@ -137,9 +137,10 @@ ex_pkg_env() { if [ "${_epe_vars_file:+1}" != 1 ]; then rtl_get_var_unsafe \$_epe_pkg_version -u "PKG_${_epe_pkg_name}_VERSION"; - ex_pkg_get_default \ - \$_epe_vars_file "${_epe_pkg_name}" \ - "${_epe_pkg_version}" "vars_file" 1 \ + ex_pkg_get_default \ + \$_epe_vars_file 1 \ + "${_epe_pkg_name}" "${_epe_pkg_version}" \ + "vars_file" \ || return 1; fi; |