[coreboot-gerrit] Change in coreboot[master]: cross-repo-cherrypick: Do not prepend "Original-" to "Cq-Depend:"

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/44843 )

Change subject: cross-repo-cherrypick: Do not prepend "Original-" to "Cq-Depend:"
......................................................................

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 
---
M util/scripts/cross-repo-cherrypick
1 file changed, 4 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved
  Paul Fagerburg: Looks good to me, approved

diff --git a/util/scripts/cross-repo-cherrypick b/util/scripts/cross-repo-cherrypick
index 3fbc46f..35e4b33 100755
--- a/util/scripts/cross-repo-cherrypick
+++ b/util/scripts/cross-repo-cherrypick
@@ -54,12 +54,15 @@
    		'"${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;