From d233bfd1a423d7515017ef4bda99ac5501120a43 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Wed, 13 Mar 2019 19:24:46 -0400 Subject: ob_reduce_deps(): Use -p instead of -P for platform Same rationale as in commit 34f21a5. --- diff --git a/lib/deps.sh b/lib/deps.sh index bc524cc..629c5bb 100644 --- a/lib/deps.sh +++ b/lib/deps.sh @@ -193,7 +193,7 @@ ob_parse_dep() ## package relationships are union lists. ## @option -a host_arch The architecture to which dependencies should be ## reduced. Required. -## @option -P host_plat The platform to which dependencies should be reduced. +## @option -p host_plat The platform to which dependencies should be reduced. ## Required. ## @option -u - Treat \fIdeps\fP as a union list. ## @operand deps req The list of dependencies to reduce. @@ -215,12 +215,12 @@ ob_reduce_deps() union='false' OPTIND=1 - while getopts 'a:P:u' opt; do + while getopts 'a:p:u' opt; do case "${opt}" in a) host_arch="${OPTARG}" ;; - P) + p) host_plat="${OPTARG}" ;; u) diff --git a/src/ob-checkbuilddeps.sh b/src/ob-checkbuilddeps.sh index a7b6306..a87831e 100644 --- a/src/ob-checkbuilddeps.sh +++ b/src/ob-checkbuilddeps.sh @@ -59,7 +59,7 @@ check_build_deps() deps="$(ob_get_source_parameter 'Build-Depends')" deps="$(ob_reduce_deps -a "${OPK_HOST_ARCH}" \ - -P "${OPK_HOST_PLAT}" "${deps}")" + -p "${OPK_HOST_PLAT}" "${deps}")" deps="$(ob_substvars "${deps}")" missing='' diff --git a/src/ob-gencontrol.sh b/src/ob-gencontrol.sh index 94c2471..ffbaf82 100644 --- a/src/ob-gencontrol.sh +++ b/src/ob-gencontrol.sh @@ -80,12 +80,12 @@ gen_control() ;; 'Depends'|'Recommends'|'Suggests'|'Pre-Depends') value="$(ob_reduce_deps -a "${OPK_HOST_ARCH}" \ - -P "${OPK_HOST_PLAT}" "${value}")" + -p "${OPK_HOST_PLAT}" "${value}")" value="$(ob_substvars "${value}")" ;; 'Conflicts'|'Provides'|'Replaces') value="$(ob_reduce_deps -a "${OPK_HOST_ARCH}" \ - -P "${OPK_HOST_PLAT}" -u "${value}")" + -p "${OPK_HOST_PLAT}" -u "${value}")" value="$(ob_substvars "${value}")" ;; esac -- cgit v0.9.1