contrib: merge-kernel: Create Cq-Depend: tag instead of CQ-DEPEND=
The CQ-DEPEND= tag was replaced with Cq-Depend:, and its location
changed to be together with Change-Id:.
Change-Id: I9af63e4b34e58378d1298e617a5ab5734bbfedba
Signed-off-by: Guenter Roeck <groeck@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/1682004
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Zubin Mithra <zsm@chromium.org>
diff --git a/contrib/merge-kernel b/contrib/merge-kernel
index 77bb6fb..e659b41 100755
--- a/contrib/merge-kernel
+++ b/contrib/merge-kernel
@@ -75,7 +75,7 @@
-l change-id Apply patch extracted from CL:change-id prior to merge.
May be repeated multiple times.
-n Send notification e-mail to ${notify_to}.
- -q dependency Add dependency (CQ-DEPEND=<dependency>)
+ -q dependency Add dependency (Cq-Depend: <dependency>)
-p Prepare for upload into Gerrit. Implied if -u is specified.
-r Name of branch to base merge on. Determined from stable
release tag or from target branch name if not provided.
@@ -227,7 +227,7 @@
done
bug="BUG=${bugs}"
fi
- dependency="${dependency:+CQ-DEPEND=${dependency}}"
+ dependency="${dependency:+Cq-Depend: ${dependency}}"
}
# Validate environment and repository.
@@ -532,7 +532,7 @@
changeid="${ochangeid}"
fi
- odependency=$(grep "^CQ-DEPEND=" "${tmpfile}")
+ odependency=$(grep "^Cq-Depend:" "${tmpfile}")
if [[ -n "${dependency}" && -n "${odependency}" && \
"${dependency}" != "${odependency}" && ${force} -eq 0 ]]; then
die "Dependency mismatch: '${dependency}' <-> '${odependency}'. Use -f to override."
@@ -712,13 +712,13 @@
echo
+ echo "${bug}"
+ echo "TEST=Build and test on various affected systems"
+ echo
if [[ -n "${dependency}" ]]; then
echo "${dependency}"
fi
- echo "${bug}"
- echo "TEST=Build and test on various affected systems"
if [[ -n "${changeid}" ]]; then
- echo
echo "${changeid}"
fi
) >> "${tmpfile}"
