diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-03-18 16:30:48 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-03-18 16:30:48 (EDT) |
| commit | 06f8ae1a6b17414e00f51e3db495daa1b66a9c15 (patch) | |
| tree | dcc467aa48f0396749bfd9744bfbe51b3359b590 /src | |
| parent | 7e86caf5c2411a71be360ee2d99869a8b2e076b7 (diff) | |
ob_substvars(): Substitute binary package vars
Diffstat (limited to 'src')
| -rw-r--r-- | src/ob-checkbuilddeps.sh | 2 | ||||
| -rw-r--r-- | src/ob-genchanges.sh | 2 | ||||
| -rw-r--r-- | src/ob-gencontrol.sh | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/ob-checkbuilddeps.sh b/src/ob-checkbuilddeps.sh index 39d7e60..f75cf43 100644 --- a/src/ob-checkbuilddeps.sh +++ b/src/ob-checkbuilddeps.sh @@ -60,7 +60,7 @@ check_build_deps() deps="$(ob_get_source_parameter 'Build-Depends')" deps="$(ob_reduce_deps -a "${OPK_HOST_ARCH}" \ -p "${OPK_HOST_PLAT}" -- "${deps}")" - deps="$(ob_substvars "${deps}")" + deps="$(ob_substvars "${deps}" '')" missing='' IFS=',' diff --git a/src/ob-genchanges.sh b/src/ob-genchanges.sh index f972002..9e8c75a 100644 --- a/src/ob-genchanges.sh +++ b/src/ob-genchanges.sh @@ -48,7 +48,7 @@ write_changes() ob_set_package_substvars "${pkg}" desc="$(ob_get_binary_parameter "${pkg}" 'Description' | \ head -n 1)" - desc="$(ob_substvars "${desc}")" + desc="$(ob_substvars "${desc}" "${pkg}")" printf ' %s - %s\n' "${pkg}" "${desc}" >&3 done diff --git a/src/ob-gencontrol.sh b/src/ob-gencontrol.sh index e42ab60..c2eb61b 100644 --- a/src/ob-gencontrol.sh +++ b/src/ob-gencontrol.sh @@ -95,14 +95,16 @@ gen_control() -a "${OPK_HOST_ARCH}" \ -p "${OPK_HOST_PLAT}" \ -- "${value}")" - value="$(ob_substvars "${value}")" + value="$(ob_substvars "${value}" \ + "${binary}")" ;; 'Conflicts' | 'Provides' | 'Replaces') value="$(ob_reduce_deps \ -a "${OPK_HOST_ARCH}" \ -p "${OPK_HOST_PLAT}" \ -u -- "${value}")" - value="$(ob_substvars "${value}")" + value="$(ob_substvars "${value}" \ + "${binary}")" ;; esac printf '%s: %s\n' "${name}" "${value}" | \ @@ -222,7 +224,7 @@ main() plat="$(ob_get_binary_parameter "${pkg}" 'Platform')" [ x"${plat}" != x'all' ] && plat="${OPK_HOST_PLAT}" desc="$(ob_get_binary_parameter "${pkg}" 'Description')" - desc="$(ob_substvars "${desc}")" + desc="$(ob_substvars "${desc}" "${pkg}")" gen_control "${pkg}" "${OPK_BINARY_VERSION}" \ "${arch}" "${plat}" "${desc}" 'true' install_maintainer_scripts "${pkg}" |