diff options
author | P. J. McDermott <pjm@nac.net> | 2012-02-03 07:51:59 (EST) |
---|---|---|
committer | P. J. McDermott <pjm@nac.net> | 2012-02-03 07:51:59 (EST) |
commit | fdffaa4c30a2e03038f52a4b3bf3d04724df307c (patch) | |
tree | 5075452210753703221bf38742d52ca1b216c9b1 | |
parent | 93fd0ee59af31fc67696e878b0bf51220a6b43a7 (diff) |
Fix architecture of platform-dependent packages.
-rw-r--r-- | lib/architecture | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/lib/architecture b/lib/architecture index daf8fff..3e80e82 100644 --- a/lib/architecture +++ b/lib/architecture @@ -63,19 +63,11 @@ oh_get_package_architecture() return 0 fi - # "any". - if [ "${_pkgarch}" = any ]; then + if [ -n "${OH_PLATFORM}" ]; then + echo "${OH_PLATFORM}" + else echo "${OH_ARCH}" - return 0 - fi - - # Target platform. - if [ -n "$(echo "${_pkgarch}" | grep -E '^[^-]+$')" ]; then - echo "${_pkgarch}" - return 0 fi - # Target binary architecture. - echo "${OH_ARCH}" return 0 } |