summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2013-01-22 12:18:05 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-22 15:44:12 (GMT)
commitc3256233c6ce27e8ef0cecfbd4939bb3bedc16ad (patch)
treec0d5818992efb1c7d7486f480b37d4c47270fcf1
parentcd9ff3c676a875cc6e30b9bd4057ec93429496b0 (diff)
downloadpoky-c3256233c6ce27e8ef0cecfbd4939bb3bedc16ad.tar.gz
populate_sdk_base.bbclass: Allow installation of ix86 SDK on x86_64 host
Commit c04f5435 "populate_sdk_base.bbclass: use SDK_ARCH instead of SDKMACHINE" prevents not only the installation of 64 bit SDK configurations on 32 bit hosts (which indeed cannot work), but also the legitimate installation of a 32 bit SDK on a 64 bit host. Fix this. While there, also make sure we use the same patterns ("i[3-6]86" resp. "x86[-_]64" to get unified strings for both INST_ARCH and SDK_ARCH. (From OE-Core rev: 7ddd97b9b09fe7a327916ea88908a63375556ae6) Signed-off-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/populate_sdk_base.bbclass9
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index da846b4..c587af8 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -122,11 +122,14 @@ fakeroot create_shar() {
122#!/bin/bash 122#!/bin/bash
123 123
124INST_ARCH=$(uname -m | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/") 124INST_ARCH=$(uname -m | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/")
125SDK_ARCH=$(echo ${SDK_ARCH} | sed -e "s/i[5-6]86/ix86/") 125SDK_ARCH=$(echo ${SDK_ARCH} | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/")
126 126
127if [ "$INST_ARCH" != "$SDK_ARCH" ]; then 127if [ "$INST_ARCH" != "$SDK_ARCH" ]; then
128 echo "Error: Installation machine not supported!" 128 # Allow for installation of ix86 SDK on x86_64 host
129 exit 1 129 if [ "$INST_ARCH" != x86_64 -o "$SDK_ARCH" != ix86 ]; then
130 echo "Error: Installation machine not supported!"
131 exit 1
132 fi
130fi 133fi
131 134
132DEFAULT_INSTALL_DIR="${SDKPATH}" 135DEFAULT_INSTALL_DIR="${SDKPATH}"