summaryrefslogtreecommitdiffstats
path: root/lib/architecture
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2012-02-20 20:03:21 (EST)
committer P. J. McDermott <pjm@nac.net>2012-02-20 20:03:21 (EST)
commite5220b4c6834471bc085e002280f4c3b16e3b6e0 (patch)
treec87c325fcac6436b0855ef7147aa8537e7316cd5 /lib/architecture
parent32505bcc85b03c5916ab8ffd8c64aeb3e846456b (diff)
Remove CPU vendor from architecture tuple.
Diffstat (limited to 'lib/architecture')
-rw-r--r--lib/architecture6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/architecture b/lib/architecture
index 3e80e82..79f3dbb 100644
--- a/lib/architecture
+++ b/lib/architecture
@@ -35,16 +35,14 @@ oh_is_buildable()
return [ "${_pkgarch}" = "${OH_PLATFORM}" ]
fi
- # Tokenize the 4-tuple binary architecture.
- IFS=- read _pkgcpu _pkgvendor _pkgkernel _pkglibs <<EOF
+ # Tokenize the 3-tuple binary architecture.
+ IFS=- read _pkgcpu _pkgkernel _pkglibs <<EOF
${_pkgarch}
EOF
# Test each element of the tuple.
[ "${_pkgcpu}" != any -a "${_pkgcpu}" != "${OH_ARCH_CPU}" ] &&
return 1
- [ "${_pkgvendor}" != any -a "${_pkgvendor}" != "${OH_ARCH_VENDOR}" ] &&
- return 1
[ "${_pkgkernel}" != any -a "${_pkgkernel}" != "${OH_ARCH_KERNEL}" ] &&
return 1
[ "${_pkglibs}" != any -a "${_pkglibs}" != "${OH_ARCH_LIBS}" ] &&