sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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 <kramasub@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44843
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
Karthikeyan Ramasubramanian
2020-08-26 12:10:10 -06:00
committed by Patrick Georgi
parent 0c9bdc456e
commit cb5961d148
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
util/scripts/cross-repo-cherrypick
View File

@@ -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;