commit 8d239b503c6107827433efdae16ad6d6330b4f74
author Bhanu Prakash Maiya <bhanumaiya@google.com> Thu Aug 05 15:20:23 2021 -0700
committer Commit Bot <commit-bot@chromium.org> Thu Aug 12 16:34:23 2021 +0000
tree 4a143d9b723543c007bee4cea43bff46cd4e650c
parent 0a01fab0c15f03ee661ede5786a58ee48755a454

copy_cras_config: Add check for cras-cofig folder in chromeos-bsp

BUG=b:195354362
TEST=`new_variant_fulltest.sh guybrush && echo PASS`

Change-Id: I3ce087e62d297fcace8c8e7320738913be948c7e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/3076149
Tested-by: Bhanu Prakash Maiya <bhanumaiya@google.com>
Auto-Submit: Bhanu Prakash Maiya <bhanumaiya@google.com>
Commit-Queue: Paul Fagerburg <pfagerburg@chromium.org>
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>

contrib/variant/copy_cras_config.sh

diff --git a/contrib/variant/copy_cras_config.sh b/contrib/variant/copy_cras_config.sh
index b1c04d6..7ec5520 100755
--- a/contrib/variant/copy_cras_config.sh
+++ b/contrib/variant/copy_cras_config.sh
@@ -3,7 +3,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-VERSION="1.4.0"
+VERSION="1.5.0"
 SCRIPT=$(basename -- "${0}")
 set -e
 
@@ -47,7 +47,17 @@
 # Assign BUG= text, or "None" if that parameter wasn't specified.
 BUG=${4:-None}
 
-cd "${HOME}/trunk/src/overlays/overlay-${BASE}/chromeos-base/chromeos-bsp-${BASE}/files/cras-config"
+CHROMEOS_BSP_DIR="${HOME}/trunk/src/overlays/overlay-${BASE}/chromeos-base/chromeos-bsp-${BASE}"
+
+if [[ -d "${CHROMEOS_BSP_DIR}/files/cras-config" ]]; then
+  CRAS_DIR="files/cras-config"
+elif [[ -d "${CHROMEOS_BSP_DIR}/files/${REFERENCE}/audio/cras-config" ]]; then
+  CRAS_DIR="files/${REFERENCE}/audio/cras-config"
+else
+  echo "cras-config dir does not exists in overlay-${BASE}."
+fi
+
+cd "${CHROMEOS_BSP_DIR}"
 
 # If there are pending changes, exit the script (unless overridden)
 check_pending_changes "$(pwd)"
@@ -62,13 +72,13 @@
 cleanup() {
   # If there is an error after the `repo start`, then restore modified files
   # to clean up and `repo abandon` the new branch.
-  cd "${HOME}/trunk/src/overlays/overlay-${BASE}/chromeos-base/chromeos-bsp-${BASE}"
+  cd "${CHROMEOS_BSP_DIR}"
   git restore --staged "*.ebuild"
   git restore "*.ebuild"
   if [[ ! -z "${NEWEBUILD}" ]] ; then
     rm -f "${NEWEBUILD}"
   fi
-  cd "files/cras-config"
+  cd "${CRAS_DIR}"
   if [[ -e "${VARIANT}" ]] ; then
     rm -Rf "${VARIANT}"
     # Use || true so that if the new files haven't been added yet, the error
@@ -79,13 +89,17 @@
 }
 trap 'cleanup' ERR
 
-# ebuild will be located 2 directories up.
-pushd ../..
+# ebuild will be located in CHROMEOS_BSP_DIR.
 revbump_ebuild
-popd
+
+if [[ $CRAS_DIR == "files/cras-config" ]]; then
+  cd "files/cras-config"
+else
+  cd "files/"
+fi
 
 mkdir "${VARIANT}"
-cp "${REFERENCE}"/* "${VARIANT}"
+cp -r "${REFERENCE}"/* "${VARIANT}"
 git add "${VARIANT}"
 git commit -m "${BASE}: Add ${VARIANT} cras config