From 71223efba8f4e3f50a93ed184648fd3eaedfce0a Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Wed, 13 Mar 2019 19:28:27 -0400 Subject: ob_get_binary_packages(): Use -p instead of -P for platform --- diff --git a/lib/package.sh b/lib/package.sh index d66d596..6aa7b94 100644 --- a/lib/package.sh +++ b/lib/package.sh @@ -76,12 +76,12 @@ ob_get_binary_packages() local pkgs= OPTIND=1 - while getopts 'a:P:' opt; do + while getopts 'a:p:' opt; do case "${opt}" in a) host_arch="${OPTARG}" ;; - P) + p) host_plat="${OPTARG}" ;; ?) diff --git a/src/opkbuild.sh b/src/opkbuild.sh index 4c96098..7d49214 100644 --- a/src/opkbuild.sh +++ b/src/opkbuild.sh @@ -296,26 +296,26 @@ setup_build() { OPK_PACKAGES="$(\ ob_get_binary_packages -a "${OPK_HOST_ARCH}" \ - -P "${OPK_HOST_PLAT}"; \ - ob_get_binary_packages -a "${OPK_HOST_ARCH}" -P 'all'; \ - ob_get_binary_packages -a 'all' -P "${OPK_HOST_PLAT}"; \ - ob_get_binary_packages -a 'all' -P 'all')" + -p "${OPK_HOST_PLAT}"; \ + ob_get_binary_packages -a "${OPK_HOST_ARCH}" -p 'all'; \ + ob_get_binary_packages -a 'all' -p "${OPK_HOST_PLAT}"; \ + ob_get_binary_packages -a 'all' -p 'all')" # This is an internal non-SPF variable. The definition of OPK_PACKAGES # may change in future SPF versions. # TODO: ??? OPK_PACKAGES_REDUCED="$(\ ob_get_binary_packages -a "${OPK_HOST_ARCH}" \ - -P "${OPK_HOST_PLAT}")" + -p "${OPK_HOST_PLAT}")" if ! ${opt_plat_dep}; then OPK_PACKAGES_REDUCED="${OPK_PACKAGES_REDUCED} $(\ - ob_get_binary_packages -a "${OPK_HOST_ARCH}" -P 'all')" + ob_get_binary_packages -a "${OPK_HOST_ARCH}" -p 'all')" fi if ! ${opt_arch_dep}; then OPK_PACKAGES_REDUCED="${OPK_PACKAGES_REDUCED} $(\ - ob_get_binary_packages -a 'all' -P "${OPK_HOST_PLAT}")" + ob_get_binary_packages -a 'all' -p "${OPK_HOST_PLAT}")" if ! ${opt_plat_dep}; then OPK_PACKAGES_REDUCED="${OPK_PACKAGES_REDUCED} $(\ - ob_get_binary_packages -a 'all' -P 'all')" + ob_get_binary_packages -a 'all' -p 'all')" fi fi -- cgit v0.9.1