From 8a26adfca6b5607a7a0975b17ce3483959657f41 Mon Sep 17 00:00:00 2001
From: Daniel Baluta <daniel.baluta@nxp.com>
Date: Wed, 10 Jun 2026 17:14:09 +0300
Subject: [PATCH 1/2] scripts: Add support to checkout specific commits for
 alsa repos

Replace the hardcoded COMMIT_ID array with runtime command line
parameters.

Each repo can now be checked out to a specific commit or tag by passing
--<repo-name>-commit=<ref> on the command line, e.g.:

  --alsa-lib-commit=v1.2.3
  --alsa-utils-commit=abc1234

If no commit is provided for a specific repo then the code will
be updated with latest code on remote. This is a slight modification
from the original code where a list of hardcoded commits was used.

But that behavior was already broken, e.g the hardcoded commit
for alsa-utils cannot be found in git tree anyway.

Also, remove check_commit() as it's no longer needed.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
---
 scripts/build-alsa-tools.sh | 47 +++++++++++++++----------------------
 1 file changed, 19 insertions(+), 28 deletions(-)

diff --git a/scripts/build-alsa-tools.sh b/scripts/build-alsa-tools.sh
index 5e1e7f75d39d..1445f3ce262b 100755
--- a/scripts/build-alsa-tools.sh
+++ b/scripts/build-alsa-tools.sh
@@ -12,14 +12,17 @@ declare -a REPOS=(
     # 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.
-# This array order must align with REPO array above.
-declare -a COMMIT_ID=(
-    "df8f1cc1ec9d9ee15be5e2c23ad25b9389fd8766"
-    "09550cd393b1a7d307ee6f26637b1ed7bd275e38"
-    # Add more IDs here...
-)
+# Per-repo commit/tag overrides via --<repo-name>-commit=<ref>.
+# Example: --alsa-lib-commit=v1.2.3  --alsa-utils-commit=abc1234
+# If not provided for a repo the original update logic (fetch + pull) applies.
+declare -A REPO_COMMIT
+for arg in "$@"; do
+    case "$arg" in
+        --*-commit=*)
+            key="${arg#--}"
+            REPO_COMMIT["${key%-commit=*}"]="${key#*-commit=}" ;;
+    esac
+done
 
 # Directory where repositories will be cloned/updated.
 if [[ -z "$SOF_WORKSPACE" ]]; then
@@ -50,23 +53,6 @@ declare -a TARGET_ARGS=(
     "--enable-alsatopology"
 )
 
-# Function to check if a commit ID exists in a repository
-check_commit() {
-    local repo_dir="$1"
-    local commit_id="$2"
-
-    if [ -z "$commit_id" ]; then
-        return 0  # Skip check if no commit ID is provided
-    fi
-
-    if ! git -C "$repo_dir" rev-parse --quiet --verify "$commit_id" >/dev/null 2>&1; then
-        return 1  # Commit ID not found
-    else
-        return 0  # Commit ID found
-    fi
-}
-
-
 # Function to update the repository
 update_repo() {
     local repo_dir="$1"
@@ -114,10 +100,15 @@ for ((i = 0; i < ${#REPOS[@]}; i++)); do
     if [ ! -d "$repo_dir" ]; then
         echo "Cloning repository: $repo_url"
         git clone "$repo_url" "$repo_dir" || { echo "git clone failed for $repo_url"; exit 1; }
-    elif ! check_commit "$repo_dir" "${COMMIT_ID[i]}"; then
-        update_repo "$repo_dir"
+    fi
+
+    ref="${REPO_COMMIT[$repo_name]}"
+    if [[ -n "$ref" ]]; then
+        git -C "$repo_dir" fetch --all
+        git -C "$repo_dir" checkout "$ref" ||
+            { echo "git checkout $ref failed in $repo_dir"; exit 1; }
     else
-        echo "Repository $repo_name is up to date."
+        update_repo "$repo_dir"
     fi
 
     build_and_install "$repo_dir" "${CONFIGURE_ARGS[i]}"

From cd0c6b46a0bc29df7326e3aad5d16b98807e33ff Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 11 Jun 2026 07:36:51 +0000
Subject: [PATCH 2/2] scripts: build-alsa-tools: handle detached HEAD update

---
 scripts/build-alsa-tools.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/scripts/build-alsa-tools.sh b/scripts/build-alsa-tools.sh
index 1445f3ce262b..188a24f2e8ea 100755
--- a/scripts/build-alsa-tools.sh
+++ b/scripts/build-alsa-tools.sh
@@ -56,8 +56,23 @@ declare -a TARGET_ARGS=(
 # Function to update the repository
 update_repo() {
     local repo_dir="$1"
+    local default_branch
     echo "Updating repository: $repo_dir"
     git -C "$repo_dir" fetch --all
+
+    if ! git -C "$repo_dir" symbolic-ref -q HEAD >/dev/null; then
+        default_branch=$(git -C "$repo_dir" symbolic-ref --quiet --short refs/remotes/origin/HEAD 2>/dev/null || true)
+        default_branch="${default_branch#origin/}"
+
+        if [[ -z "$default_branch" ]]; then
+            echo "Error: unable to determine default branch in $repo_dir" >&2
+            exit 1
+        fi
+
+        git -C "$repo_dir" checkout "$default_branch" 2>/dev/null || \
+            git -C "$repo_dir" checkout -b "$default_branch" --track "origin/$default_branch"
+    fi
+
     git -C "$repo_dir" pull
 }