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

[Karthik Ramasubramanian (Code Review)]

Karthik Ramasubramanian has uploaded this change for review. ( 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 
---
M util/scripts/cross-repo-cherrypick
1 file changed, 6 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/43/44843/1

diff --git a/util/scripts/cross-repo-cherrypick b/util/scripts/cross-repo-cherrypick
index 3fbc46f..3794e20 100755
--- a/util/scripts/cross-repo-cherrypick
+++ b/util/scripts/cross-repo-cherrypick
@@ -54,12 +54,17 @@
    		'"${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:/ {
+		if (end==0) {
+			print "Original-Commit-Id: '"${CID}"'\nSigned-off-by: '"${GUID}"'";
+		}
+		end=1
    }; {
    	if (end==0)
    		print "Original-" $0;