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/ob-gencontrol.sh | |
| parent | 7e86caf5c2411a71be360ee2d99869a8b2e076b7 (diff) | |
ob_substvars(): Substitute binary package vars
Diffstat (limited to 'src/ob-gencontrol.sh')
| -rw-r--r-- | src/ob-gencontrol.sh | 8 |
1 files changed, 5 insertions, 3 deletions
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}" |