diff options
| author | Nikita Ioffe <ioffe@google.com> | 2024-04-22 20:45:34 +0000 |
|---|---|---|
| committer | Matthias Männich <maennich@google.com> | 2024-04-24 13:52:42 +0000 |
| commit | fef6c0bcefb4f2e39789a938f1dd11032195b87b (patch) | |
| tree | a7937f2afad7ff5db75839a5989b9cbf1db99e6f | |
| parent | b8f7cd89405edc4a41552f8a8250420aa60b1a16 (diff) | |
| download | build-fef6c0bcefb4f2e39789a938f1dd11032195b87b.tar.gz | |
Only commit microdroid kernel prebuilt onces
Currently, both arm64 and x86_64 kernel prebuilts belong to the same git
project. This means that the commit message for the second path has
confusing empty gitlog inside (see aosp/3018344 and aosp/3018343 for
example).
This patch fixes the issue by committing the prebuilt only once. You can
check aosp/3053322 and an example output of the script.
Bug: 291071984
Test: ./build/kernel/gki/download_from_gki --update-microdroid
Change-Id: Iad1e37d9061fba259e28e264c3cdd4788c41f07f
| -rwxr-xr-x | gki/download_from_ci | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gki/download_from_ci b/gki/download_from_ci index 76b5700..ca504d4 100755 --- a/gki/download_from_ci +++ b/gki/download_from_ci @@ -757,9 +757,10 @@ def update_microdroid_kernel(): clean_download_dir(directory) download_kernel("kernel_microdroid_" + arch_suffix, version, directory) write_prebuilt_info(directory) - (new_version, new_sha) = get_binary_kernel_version(kernel) - gitlog = get_git_log(old_sha, new_sha) - commit_prebuilts(directory, gitlog) + + (_, new_sha) = get_binary_kernel_version(kernel) + gitlog = get_git_log(old_sha, new_sha) + commit_prebuilts(base_dir, gitlog) def main(): |