Jelajahi Sumber

Script updates for AWSNativeSDK-1.9.50 on Linux aarch64 (ARM64) (#137)

Signed-off-by: Steve Pham <[email protected]>
Steve Pham 2 tahun lalu
induk
melakukan
28d0e6d63e

+ 4 - 2
package-system/AWSNativeSDK/build_AWSNativeSDK_linux.sh

@@ -33,11 +33,13 @@ else
 fi
 
 # Make sure docker is installed
-if ! dpkg-query -W -f'${Status}' "docker" 2>/dev/null | grep -q "ok installed"
+DOCKER_VERSION=$(docker --version)
+if [ $? -ne 0 ]
 then
     echo "Required package docker is not installed"
-    exit 1 
+    exit 1
 fi
+echo "Detected Docker Version $DOCKER_VERSION"
 
 # Prepare the docker file and use the temp folder as the context root
 cp Dockerfile.ubuntu.${UBUNTU_VERSION} temp/Dockerfile

+ 4 - 2
package-system/AWSNativeSDK/build_AWSNativeSDK_linux_OpenSSL3.sh

@@ -33,11 +33,13 @@ else
 endif 
 
 # Make sure docker is installed
-if ! dpkg-query -W -f'${Status}' "docker" 2>/dev/null | grep -q "ok installed"
+DOCKER_VERSION=$(docker --version)
+if [ $? -ne 0 ]
 then
     echo "Required package docker is not installed"
-    exit 1 
+    exit 1
 fi
+echo "Detected Docker Version $DOCKER_VERSION"
 
 # Prepare the docker file and use the temp folder as the context root
 cp Dockerfile.ubuntu.${UBUNTU_VERSION} temp/Dockerfile

+ 3 - 3
package-system/AWSNativeSDK/build_config.json

@@ -80,9 +80,9 @@
             "custom_install_cmd": [
                "./install_AWSNativeSDK_linux.sh"
             ]
-         }
-
-
+         },
+	 "Linux-OpenSSL-1-aarch64": "@Linux-OpenSSL-1",
+	 "Linux-OpenSSL-3-aarch64": "@Linux-OpenSSL-3"
       }
    }
 }

+ 4 - 0
package_build_list_host_linux-aarch64.json

@@ -5,6 +5,8 @@
     "comment4" : "Note:  Build from source occurs before build_from_folder",
     "build_from_source": {
         "AwsIotDeviceSdkCpp-1.15.2-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Linux-aarch64 --clean",
+        "AWSNativeSDK-1.9.50-rev2-linux-openssl-1-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux-OpenSSL-1-aarch64 --clean",
+        "AWSNativeSDK-1.9.50-rev2-linux-openssl-3-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Linux-OpenSSL-3-aarch64 --clean",
         "freetype-2.11.1-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Linux-aarch64 --clean",
         "googlebenchmark-1.5.0-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googlebenchmark --platform-name Linux-aarch64 --clean",
         "googletest-1.8.1-rev4-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googletest --platform-name Linux-aarch64 --clean",
@@ -18,6 +20,8 @@
     },
     "build_from_folder": {
         "AwsIotDeviceSdkCpp-1.15.2-rev1-linux-aarch64": "package-system/AwsIotDeviceSdkCpp/temp/AwsIotDeviceSdkCpp-linux-aarch64",
+        "AWSNativeSDK-1.9.50-rev2-linux-openssl-1-aarch64": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux-openssl-1-aarch64",
+        "AWSNativeSDK-1.9.50-rev2-linux-openssl-3-aarch64": "package-system/AWSNativeSDK/temp/AWSNativeSDK-linux-openssl-3-aarch64",
         "freetype-2.11.1-rev1-linux-aarch64": "package-system/freetype/temp/freetype-linux-aarch64",
         "googlebenchmark-1.5.0-rev2-linux-aarch64": "package-system/googlebenchmark/temp/googlebenchmark-linux-aarch64",
         "googletest-1.8.1-rev4-linux-aarch64": "package-system/googletest/temp/googletest-linux-aarch64",