Updated get_arch() function in linux/installer/bin/build-installpkg.sh script to support all system languages.

The old get_arch() function would only work on systems configured in English, since it looked for the 'Class:' string.
The new get_arch() function uses the 'magic' information from the readelf output to determine the architecture of the build from generated binary.

Signed-off-by: Rodolfo Silva <rodolfo@grupomarinho.com.br>
This commit is contained in:
Rodolfo Silva 2016-11-09 10:18:30 -03:00
parent 2cdbf76624
commit 5ac65167be

View File

@ -57,8 +57,8 @@ BUILD_DIR=${ROOT_DIR}/build/linux
# Get the architecture of the build from generated binary # Get the architecture of the build from generated binary
get_arch() get_arch()
{ {
local a=$(readelf -h $BUILD_DIR/sgx_sign | awk '/Class:/{print $2}') local a=$(readelf -h $BUILD_DIR/sgx_sign | sed -n '2p' | awk '/:/{print $6}')
test $a = ELF64 && echo 'x86_64' || echo 'x86' test $a = 02 && echo 'x86_64' || echo 'x86'
} }