scripts: update build-alsa-tools.sh for testing [DNM]

Signed-off-by: Christopher Turner <christopher.g.turner@intel.com>

Author: cgturner1

scripts/build-alsa-tools.sh

@@ -5,15 +5,14 @@
 # fail immediately on any errors
 set -e
 
-# Array of ALSA Git repository URLs.  Add or remove repositories as needed.
+# Array of ALSA Git repository URLs. Add or remove repositories as needed.
 declare -a REPOS=(
     "https://github.com/thesofproject/alsa-lib.git"
     "https://github.com/thesofproject/alsa-utils.git"
-    # Add more repositories here...
 )
 
 # Commit ID to check for (optional). If specified, the script will update
-# the repository if this commit ID is not found.  Leave empty to skip.
+# the repository if this commit ID is not found. Leave empty to skip.
 declare -a COMMIT_ID=(
     "df8f1cc1ec9d9ee15be5e2c23ad25b9389fd8766"
     "09550cd393b1a7d307ee6f26637b1ed7bd275e38"
@@ -28,21 +27,25 @@ else
   BASE_DIR="$SOF_WORKSPACE"
 fi
 
-# Arguments to pass to ./configure for each repository.  Add or remove
+# Unified installation paths (same as Dockerfile)
+INSTALL_PREFIX="/usr"
+LIB_DIR="/usr/lib/x86_64-linux-gnu"
+
+# Arguments to pass to ./configure for each repository
 declare -a CONFIGURE_ARGS=(
-    "--prefix=${BASE_DIR}/tools"
-    "--prefix=${BASE_DIR}/tools \
-        --with-alsa-prefix=${BASE_DIR}/tools \
-        --with-alsa-inc-prefix=${BASE_DIR}/tools/include \
-        --with-sysroot=${BASE_DIR}/tools \
-        --with-udev-rules-dir=${BASE_DIR}/tools \
-        PKG_CONFIG_PATH=${BASE_DIR}/tools \
-        LDFLAGS=-L${BASE_DIR}/tools/lib \
-        --with-asound-state-dir=${BASE_DIR}/tools/var/lib/alsa \
-        --with-systemdsystemunitdir=${BASE_DIR}/tools/lib/systemd/system"
+    "--prefix=$INSTALL_PREFIX --libdir=$LIB_DIR"
+    "--prefix=$INSTALL_PREFIX --libdir=$LIB_DIR \
+        --with-alsa-prefix=$INSTALL_PREFIX \
+        --with-alsa-inc-prefix=$INSTALL_PREFIX/include \
+        --with-sysroot=$INSTALL_PREFIX \
+        --with-udev-rules-dir=$INSTALL_PREFIX/lib/udev/rules.d \
+        PKG_CONFIG_PATH=$INSTALL_PREFIX/lib/pkgconfig \
+        LDFLAGS=-L$LIB_DIR \
+        --with-asound-state-dir=$INSTALL_PREFIX/var/lib/alsa \
+        --with-systemdsystemunitdir=$INSTALL_PREFIX/lib/systemd/system"
 )
 
-# Arguments to pass to make for each repository.  Add or remove arguments as needed.
+# Arguments to pass to make for each repository
 declare -a TARGET_ARGS=(
     "--disable-old-symbols"
     "--enable-alsatopology"
@@ -64,7 +67,6 @@ check_commit() {
     fi
 }
 
-
 # Function to update the repository
 update_repo() {
     local repo_dir="$1"
@@ -82,11 +84,11 @@ build_and_install() {
     echo "Building and installing: $repo_dir $configure_args $target_args"
 
     if [ ! -f "$repo_dir/gitcompile" ]; then
-          echo "Error: gitcompile not found in $repo_dir" >&2
-          exit 1
+        echo "Error: gitcompile not found in $repo_dir" >&2
+        exit 1
     fi
 
-    # if Makefile exists then we can just run make
+    # If Makefile exists, we can just run make
     if [ ! -f "$repo_dir/Makefile" ]; then
         (cd "$repo_dir" && ./gitcompile $configure_args $target_args) || \
             { echo "configure failed in $repo_dir"; exit 1; }
@@ -103,7 +105,7 @@ build_and_install() {
 mkdir -p "$BASE_DIR"
 
 for ((i = 0; i < ${#REPOS[@]}; i++)); do
-    echo "Counter: $i, Value: ${REPOS[i]}"
+    echo "Processing repository: ${REPOS[i]}"
     repo_url=${REPOS[i]}
 
     repo_name=$(basename "$repo_url" .git)  # Extract repo name
@@ -118,8 +120,7 @@ for ((i = 0; i < ${#REPOS[@]}; i++)); do
         echo "Repository $repo_name is up to date."
     fi
 
-    build_and_install "$repo_dir" "${CONFIGURE_ARGS[i]}"
-
+    build_and_install "$repo_dir" "${CONFIGURE_ARGS[i]}" "${TARGET_ARGS[i]}"
 done
 
-echo "All repositories processed."
+echo "All repositories processed."