sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Wolfgang Denk 2013-01-22 13:18:05 +01:00 committed by Richard Purdie
parent cd9ff3c676
commit c3256233c6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta/classes/populate_sdk_base.bbclass
View File

@ -122,11 +122,14 @@ fakeroot create_shar() {
#!/bin/bash
INST_ARCH=$(uname -m | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/")
SDK_ARCH=$(echo ${SDK_ARCH} | sed -e "s/i[5-6]86/ix86/")
SDK_ARCH=$(echo ${SDK_ARCH} | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/")
if [ "$INST_ARCH" != "$SDK_ARCH" ]; then
echo "Error: Installation machine not supported!"
exit 1
# Allow for installation of ix86 SDK on x86_64 host
if [ "$INST_ARCH" != x86_64 -o "$SDK_ARCH" != ix86 ]; then
echo "Error: Installation machine not supported!"
exit 1
fi
fi
DEFAULT_INSTALL_DIR="${SDKPATH}"