Prechádzať zdrojové kódy

Updated get_arch() function in linux/installer/common/psw/createTarball.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>

Rodolfo Silva 7 rokov pred
rodič
commit
ca3fee442e

+ 2 - 2
linux/installer/common/psw/createTarball.sh

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