diff options
Diffstat (limited to 'subr.ex/ex_pkg.subr')
| -rw-r--r-- | subr.ex/ex_pkg.subr | 18 |
1 files changed, 5 insertions, 13 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 -- \ "${@}" \ |