intel_sync_upstream: Clean up FSP uprev script
This change removes usage of uninitialized variable `LOCAL_DIR`.
It also includes an initial commit message specifying the FSP version
and the `bug_id`.
BUG=b:424692179
TEST=Able to push fsp/edk2/edk2-plaforms
Change-Id: Ia7aba5f4b45c3265c9a402e613760fe7349c7765
Signed-off-by: Pranava Y N <[email protected]>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/6877488
Reviewed-by: Nick Vaccaro <[email protected]>
Reviewed-by: Kapil Porwal <[email protected]>
Reviewed-by: Karthikeyan Ramasubramanian <[email protected]>
diff --git a/contrib/firmware/intel_sync_upstream.sh b/contrib/firmware/intel_sync_upstream.sh
index a6ec78b..5df5caf 100755
--- a/contrib/firmware/intel_sync_upstream.sh
+++ b/contrib/firmware/intel_sync_upstream.sh
@@ -41,6 +41,7 @@
SOC="$1"
DIR="$2"
VERSION="$3"
+BUG_ID="$4"
for arg in "$@"; do
if [[ "$arg" == "--external" ]]; then
@@ -61,7 +62,7 @@
STAGING_NAME="${SOC}-staging"
fi
CHROMEOS_BRANCH=chromeos
- SRC_DIR="${CHROMIUM_TOT_ROOT}/src/third_party/fsp/${SOC}/${DIR}/${LOCAL_DIR}"
+ SRC_DIR="${CHROMIUM_TOT_ROOT}/src/third_party/fsp/${SOC}/${DIR}/"
STAGING_REPO="https://chrome-internal.googlesource.com/chromeos/third_party/intel-fsp/${STAGING_NAME}"
;;
@@ -167,7 +168,7 @@
git commit
if [[ $? -eq 0 ]]; then
- COMMIT_ARGS="--amend --no-edit"
+ COMMIT_ARGS="--amend"
else
COMMIT_ARGS="-s"
fi
@@ -177,7 +178,7 @@
rm /tmp/merge-to-tag.patch
git add .
- git commit ${COMMIT_ARGS}
+ git commit ${COMMIT_ARGS} --message "Merge branch \`${VERSION}\` into chrome-internal-tot"$'\n\n'"BUG=b:${BUG_ID}" --edit
break
;;
