diff options
| author | P. J. McDermott <pjm@nac.net> | 2012-10-23 23:46:58 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2012-10-23 23:46:58 (EDT) |
| commit | 399adfd4e44a84b7ca664703240be40d4bc23528 (patch) | |
| tree | a21b276d7096f03c8586a91af2b7fd1b077e0e75 /src | |
| parent | cd8d946a86d0730244badfc79c18c6f3e914ee62 (diff) | |
| parent | ac831a4fb9a65678fb80d3c22b9db72c7140a3d7 (diff) | |
Merge branch 'feature/substvars'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ob-gencontrol.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/ob-gencontrol.sh b/src/ob-gencontrol.sh index ee5741c..0526573 100644 --- a/src/ob-gencontrol.sh +++ b/src/ob-gencontrol.sh @@ -38,12 +38,15 @@ main() gen_md5sums "src-${OPK_SOURCE}" else for pkg in ${OPK_PACKAGES}; do + ob_set_package_substvars "${pkg}" arch="$(ob_get_binary_parameter "${pkg}" 'Architecture')" [ "${arch}" != 'all' ] && arch="${OPK_HOST_ARCH}" plat="$(ob_get_binary_parameter "${pkg}" 'Platform')" [ "${plat}" != 'all' ] && plat="${OPK_HOST_PLAT}" + desc="$(ob_get_binary_parameter "${pkg}" 'Description')" + desc="$(ob_substvars "${desc}")" gen_control "${pkg}" "${OPK_BINARY_VERSION}" "${arch}" "${plat}" \ - "$(ob_get_binary_parameter "${pkg}" 'Description')" 'true' + "${desc}" 'true' install_maintainer_scripts "${pkg}" gen_conffiles "${pkg}" gen_md5sums "${pkg}" @@ -110,10 +113,12 @@ EOF 'Depends'|'Recommends'|'Suggests'|'Pre-Depends') value="$(ob_reduce_deps -a "${OPK_HOST_ARCH}" \ "${value}")" + value="$(ob_substvars "${value}")" ;; 'Conflicts'|'Provides'|'Replaces') value="$(ob_reduce_deps -a "${OPK_HOST_ARCH}" -u \ "${value}")" + value="$(ob_substvars "${value}")" ;; esac printf '%s: %s\n' "${name}" "${value}" \ |