Change default dependency installation prefix to /usr/local

jayantjn · jayantjn · commit c7ad7b9e9c9e · 2025-06-18T11:17:15.000Z
diff --git a/.github/template/fwe-build/action.yml b/.github/template/fwe-build/action.yml
@@ -25,27 +25,49 @@ runs:
       uses: actions/cache@v4
       with:
         path: cache
-        # prettier-ignore
         key: ${{ inputs.dist-name }}-${{ inputs.build-arch }}-${{ hashFiles('tools/install-deps-*.sh') }}
 
-    - name: install-deps
+    - name: restore-cache-deps
+      if: steps.cache-deps.outputs.cache-hit == 'true'
       shell: bash
       run: |
+        echo "Cache found! Restoring cached dependencies..."
         IFS=":"
         CACHE_PATHS=${{ inputs.cache-paths }}
-        if [ -d cache ]; then
-          for P in ${CACHE_PATHS}; do
-            sudo mkdir -p `dirname ${P}`
-            sudo cp -r cache${P} ${P}
-          done
-        fi
-        sudo ./tools/install-deps-${{ inputs.build-arch }}.sh ${{ inputs.extra-options }}
-        if [ ! -d cache ]; then
-          for P in ${CACHE_PATHS}; do
-            mkdir -p cache`dirname ${P}`
-            cp -r ${P} cache${P}
-          done
+        for P in ${CACHE_PATHS}; do
+          sudo mkdir -p `dirname ${P}`
+          sudo cp -r cache${P} ${P}
+        done
+
+    - name: install-deps
+      shell: bash
+      run: |
+        # Add --use-cache flag if cache hit
+        EXTRA_OPTIONS="${{ inputs.extra-options }}"
+        CACHE_HIT="${{ steps.cache-deps.outputs.cache-hit }}"
+        
+        if [[ "${CACHE_HIT}" == 'true' ]]; then
+          echo "Using cached dependencies, adding --use-cache flag"
+          EXTRA_OPTIONS="${EXTRA_OPTIONS} --use-cache"
+        else
+          echo "No cache hit, installing dependencies from scratch"
         fi
+        
+        # Run the installation script
+        echo "Running installation with options: ${EXTRA_OPTIONS}"
+        sudo ./tools/install-deps-${{ inputs.build-arch }}.sh ${EXTRA_OPTIONS}
+
+    - name: create-cache
+      if: steps.cache-deps.outputs.cache-hit != 'true'
+      shell: bash
+      run: |
+        echo "Creating cache for future runs..."
+        IFS=":"
+        CACHE_PATHS=${{ inputs.cache-paths }}
+        for P in ${CACHE_PATHS}; do
+          mkdir -p "$(dirname "cache${P}")"
+          sudo cp -r "${P}" "cache${P}"
+        done
 
     - name: build
       shell: bash
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,7 +40,7 @@ jobs:
           extra-options:
             "--with-someip-support --with-lks-support --with-greengrassv2-support
             --with-custom-function-examples --with-store-and-forward-support --with-uds-dtc-example
-            --with-micropython-support"
+            --with-micropython-support --prefix /usr/local/x86_64-linux-gnu "
           dist-name: "aws-iot-fleetwise-edge"
           cache-paths: /usr/local/x86_64-linux-gnu
           dist-files: build/aws-iot-fleetwise-edge:.
@@ -56,7 +56,7 @@ jobs:
           extra-options:
             "--with-greengrassv2-support --with-someip-support --with-lks-support
             --with-custom-function-examples --with-store-and-forward-support --with-uds-dtc-example
-            --with-micropython-support"
+            --with-micropython-support --native-prefix /usr/local/x86_64-linux-gnu "
           dist-name: "aws-iot-fleetwise-edge"
           cache-paths: /usr/local/aarch64-linux-gnu:/usr/local/x86_64-linux-gnu
           dist-files: build/aws-iot-fleetwise-edge:.
@@ -72,7 +72,8 @@ jobs:
           extra-options:
             "--with-greengrassv2-support --with-someip-support --with-lks-support
             --with-iwave-gps-support --with-custom-function-examples
-            --with-store-and-forward-support --with-uds-dtc-example --with-micropython-support"
+            --with-store-and-forward-support --with-uds-dtc-example --with-micropython-support
+            --native-prefix /usr/local/x86_64-linux-gnu "
           dist-name: "aws-iot-fleetwise-edge"
           cache-paths: /usr/local/arm-linux-gnueabihf:/usr/local/x86_64-linux-gnu
           dist-files: build/aws-iot-fleetwise-edge:.
@@ -88,7 +89,7 @@ jobs:
           extra-options:
             "--with-greengrassv2-support --with-ros2-support --with-someip-support
             --with-lks-support --with-custom-function-examples --with-store-and-forward-support
-            --with-uds-dtc-example --with-micropython-support"
+            --with-uds-dtc-example --with-micropython-support --prefix /usr/local/x86_64-linux-gnu "
           dist-name: "aws-iot-fleetwise-edge-ros2"
           cache-paths: /usr/local/x86_64-linux-gnu:/opt/ros
           dist-files: build/iotfleetwise/aws-iot-fleetwise-edge:.
@@ -104,7 +105,8 @@ jobs:
           extra-options:
             "--with-greengrassv2-support --with-ros2-support --with-someip-support
             --with-lks-support --with-custom-function-examples --with-store-and-forward-support
-            --with-uds-dtc-example --with-micropython-support"
+            --with-uds-dtc-example --with-micropython-support --native-prefix
+            /usr/local/x86_64-linux-gnu "
           dist-name: "aws-iot-fleetwise-edge-ros2"
           cache-paths: /usr/local/aarch64-linux-gnu:/usr/local/x86_64-linux-gnu:/opt/ros
           dist-files: build/iotfleetwise/aws-iot-fleetwise-edge:.
@@ -120,7 +122,8 @@ jobs:
           extra-options:
             "--with-greengrassv2-support --with-ros2-support --with-someip-support
             --with-lks-support --with-custom-function-examples --with-store-and-forward-support
-            --with-uds-dtc-example --with-micropython-support"
+            --with-uds-dtc-example --with-micropython-support --native-prefix
+            /usr/local/x86_64-linux-gnu "
           dist-name: "aws-iot-fleetwise-edge-ros2"
           cache-paths: /usr/local/arm-linux-gnueabihf:/usr/local/x86_64-linux-gnu:/opt/ros
           dist-files: build/iotfleetwise/aws-iot-fleetwise-edge:.
@@ -133,7 +136,9 @@ jobs:
         with:
           build-arch: "cross-android"
           upload-arch: "android"
-          extra-options: "--with-lks-support --with-custom-function-examples"
+          extra-options:
+            "--with-lks-support --with-custom-function-examples --native-prefix
+            /usr/local/x86_64-linux-android "
           dist-name: "aws-iot-fleetwise-edge"
           cache-paths: /usr/local/x86_64-linux-android:/usr/local/aarch64-linux-android:/usr/local/armv7a-linux-androideabi:/usr/local/x86_64-linux-gnu
           dist-files:
diff --git a/tools/install-deps-cross-android.sh b/tools/install-deps-cross-android.sh
@@ -7,7 +7,7 @@ set -euo pipefail
 SCRIPT_DIR="$(dirname "$(realpath "$0")")"
 source ${SCRIPT_DIR}/install-deps-versions.sh
 
-USE_CACHE="true"
+USE_CACHE="false"
 SDK_PREFIX="/usr/local/android_sdk"
 ARCHS="x86_64:x86_64-linux-android:android-x86_64 \
        armeabi-v7a:armv7a-linux-androideabi:android-arm \
@@ -26,9 +26,11 @@ parse_args() {
             ;;
         --native-prefix)
             NATIVE_PREFIX="$2"
-            USE_CACHE="false"
             shift
             ;;
+        --use-cache)
+            USE_CACHE="true"
+            ;;
         --help)
             echo "Usage: $0 [OPTION]"
             echo "  --archs <ARCHS>                      Space separated list of archs in the format <ARCH>:<HOST_PLATFORM>:<SSL_TARGET>"
@@ -70,7 +72,7 @@ if [ ! -d ${SDK_PREFIX} ]; then
 fi
 export PATH=${SDK_PREFIX}/cmake/${VERSION_CMAKE}/bin/:${PATH}
 
-: ${NATIVE_PREFIX:="/usr/local/`gcc -dumpmachine`"}
+: ${NATIVE_PREFIX:="/usr/local"}
 
 install_deps() {
     TARGET_ARCH="$1"
@@ -290,18 +292,10 @@ for ARCH in ${ARCHS}; do
     TARGET_ARCH=`echo $ARCH | cut -d ':' -f1`
     HOST_PLATFORM=`echo $ARCH | cut -d ':' -f2`
     SSL_TARGET=`echo $ARCH | cut -d ':' -f3`
-    BUILD="false"
-    if ! ${USE_CACHE}; then
-        echo "--native-prefix defined, building..."
-        BUILD="true"
-    elif [ ! -d ${NATIVE_PREFIX} ]; then
-        echo "${NATIVE_PREFIX} does not exist, building..."
-        BUILD="true"
-    elif [  ! -d /usr/local/${HOST_PLATFORM} ]; then
-        echo "/usr/local/${HOST_PLATFORM} does not exist, building..."
-        BUILD="true"
-    else
-        echo "/usr/local/${HOST_PLATFORM} exists, not building."
+    BUILD="true"
+    if ${USE_CACHE}; then
+        echo "using cache, not building..."
+        BUILD="false"
     fi
     if ${BUILD}; then
         install_deps ${TARGET_ARCH} ${HOST_PLATFORM} ${SSL_TARGET}
diff --git a/tools/install-deps-cross-arm64.sh b/tools/install-deps-cross-arm64.sh
@@ -7,7 +7,7 @@ set -euo pipefail
 SCRIPT_DIR="$(dirname "$(realpath "$0")")"
 source ${SCRIPT_DIR}/install-deps-versions.sh
 
-USE_CACHE="true"
+USE_CACHE="false"
 WITH_GREENGRASSV2_SUPPORT="false"
 SHARED_LIBS="OFF"
 WITH_VISION_SYSTEM_DATA="false"
@@ -41,12 +41,14 @@ parse_args() {
             ;;
         --native-prefix)
             NATIVE_PREFIX="$2"
-            USE_CACHE="false"
             shift
             ;;
         --shared-libs)
             SHARED_LIBS="ON"
             ;;
+        --use-cache)
+            USE_CACHE="true"
+            ;;
         --help)
             echo "Usage: $0 [OPTION]"
             echo "  --with-greengrassv2-support          Install dependencies for Greengrass V2"
@@ -134,9 +136,9 @@ if [ ! -f /usr/include/linux/can/isotp.h ]; then
     rm -rf can-isotp
 fi
 
-: ${NATIVE_PREFIX:="/usr/local/`gcc -dumpmachine`"}
+: ${NATIVE_PREFIX:="/usr/local"}
 
-if ! ${USE_CACHE} || [ ! -d /usr/local/aarch64-linux-gnu ] || [ ! -d ${NATIVE_PREFIX} ]; then
+if ! ${USE_CACHE}; then
     mkdir -p /usr/local/aarch64-linux-gnu/lib/cmake/
     mkdir -p ${NATIVE_PREFIX}
     cp ${SCRIPT_DIR}/arm64-toolchain.cmake /usr/local/aarch64-linux-gnu/lib/cmake/
diff --git a/tools/install-deps-cross-armhf.sh b/tools/install-deps-cross-armhf.sh
@@ -7,7 +7,7 @@ set -euo pipefail
 SCRIPT_DIR="$(dirname "$(realpath "$0")")"
 source ${SCRIPT_DIR}/install-deps-versions.sh
 
-USE_CACHE="true"
+USE_CACHE="false"
 WITH_GREENGRASSV2_SUPPORT="false"
 SHARED_LIBS="OFF"
 WITH_VISION_SYSTEM_DATA="false"
@@ -41,12 +41,14 @@ parse_args() {
             ;;
         --native-prefix)
             NATIVE_PREFIX="$2"
-            USE_CACHE="false"
             shift
             ;;
         --shared-libs)
             SHARED_LIBS="ON"
             ;;
+        --use-cache)
+            USE_CACHE="true"
+            ;;
         --help)
             echo "Usage: $0 [OPTION]"
             echo "  --with-greengrassv2-support          Install dependencies for Greengrass V2"
@@ -134,9 +136,9 @@ if [ ! -f /usr/include/linux/can/isotp.h ]; then
     rm -rf can-isotp
 fi
 
-: ${NATIVE_PREFIX:="/usr/local/`gcc -dumpmachine`"}
+: ${NATIVE_PREFIX:="/usr/local"}
 
-if ! ${USE_CACHE} || [ ! -d /usr/local/arm-linux-gnueabihf ] || [ ! -d ${NATIVE_PREFIX} ]; then
+if ! ${USE_CACHE}; then
     mkdir -p /usr/local/arm-linux-gnueabihf/lib/cmake/
     mkdir -p ${NATIVE_PREFIX}
     cp ${SCRIPT_DIR}/armhf-toolchain.cmake /usr/local/arm-linux-gnueabihf/lib/cmake/
diff --git a/tools/install-deps-native.sh b/tools/install-deps-native.sh
@@ -7,7 +7,7 @@ set -euo pipefail
 SCRIPT_DIR="$(dirname "$(realpath "$0")")"
 source ${SCRIPT_DIR}/install-deps-versions.sh
 
-USE_CACHE="true"
+USE_CACHE="false"
 INSTALL_BUILD_TIME_DEPS="true"
 WITH_GREENGRASSV2_SUPPORT="false"
 SHARED_LIBS="OFF"
@@ -42,7 +42,6 @@ parse_args() {
             ;;
         --prefix)
             PREFIX="$2"
-            USE_CACHE="false"
             shift
             ;;
         --runtime-only)
@@ -51,6 +50,9 @@ parse_args() {
         --shared-libs)
             SHARED_LIBS="ON"
             ;;
+        --use-cache)
+            USE_CACHE="true"
+            ;;
         --help)
             echo "Usage: $0 [OPTION]"
             echo "  --with-greengrassv2-support          Install dependencies for Greengrass V2"
@@ -135,9 +137,9 @@ if ${INSTALL_BUILD_TIME_DEPS} && [ ! -f /usr/include/linux/can/isotp.h ]; then
     rm -rf can-isotp
 fi
 
-: ${PREFIX:="/usr/local/`gcc -dumpmachine`"}
+: ${PREFIX:="/usr/local"}
 
-if ${INSTALL_BUILD_TIME_DEPS} && ( ! ${USE_CACHE} || [ ! -d ${PREFIX} ] ); then
+if ${INSTALL_BUILD_TIME_DEPS} && ( ! ${USE_CACHE} ); then
     mkdir -p ${PREFIX}
     mkdir deps-native
     cd deps-native
