From cb5961d1481e819610902022e93ee8faf0dc1e7c Mon Sep 17 00:00:00 2001 From: Karthikeyan Ramasubramanian Date: Wed, 26 Aug 2020 12:10:10 -0600 Subject: [PATCH] cross-repo-cherrypick: Do not prepend "Original-" to "Cq-Depend:" Marking dependencies has undergone some change in Chrome OS tree. The script to cherry-pick the changes to ChromeOS tree prepends "Original-" to the concerned meta data i.e. Cq-Depend becomes Original-Cq-Depend. This causes dependencies to not take effect when changes are submitted to the continuous integration. Do not prepend "Original-" to the dependency meta data. BUG=None TEST=Ensure that the Cq-Depend line is added without any prefix. Change-Id: I0503234954f872ee56708e19e89cae9d9fa30df7 Signed-off-by: Karthikeyan Ramasubramanian Reviewed-on: https://review.coreboot.org/c/coreboot/+/44843 Tested-by: build bot (Jenkins) Reviewed-by: Paul Fagerburg Reviewed-by: Furquan Shaikh --- util/scripts/cross-repo-cherrypick | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/util/scripts/cross-repo-cherrypick b/util/scripts/cross-repo-cherrypick index 3fbc46faed..35e4b33502 100755 --- a/util/scripts/cross-repo-cherrypick +++ b/util/scripts/cross-repo-cherrypick @@ -54,12 +54,15 @@ GUID="$(git config user.name) <$(git config user.email)>" '"${SPLICE_CMD}"' } end=1 - }; /^(BUG|BRANCH|TEST|CQ-DEPEND)=/ { + }; /^(BUG|BRANCH|TEST)=/ { if (end==0) { print "Original-Commit-Id: '"${CID}"'\nSigned-off-by: '"${GUID}"'"; print ""; } end=1 + }; /^Cq-Depend:/ { + print $0; + next }; { if (end==0) print "Original-" $0;