diff options
| author | Ram Muthiah <rammuthiah@google.com> | 2021-10-15 14:35:56 -0700 |
|---|---|---|
| committer | Ram Muthiah <rammuthiah@google.com> | 2021-10-15 14:35:56 -0700 |
| commit | 625b92af180c6cfbe21fe0b5c2b53d265c7d860d (patch) | |
| tree | b5710aa8b9270fa106b4ffd7459a8bf2365817d9 | |
| parent | 4da9f3c3a2983d668bfccbc4e903d5084e884a0b (diff) | |
| download | build-625b92af180c6cfbe21fe0b5c2b53d265c7d860d.tar.gz | |
Add locked bootloader cfgs to uboot update scripts
Bug: 155019925
Test: local run
Change-Id: Ic47ba993e885e6582eadf3e45b659f44bddf8187
| -rwxr-xr-x | gki/download_from_ci | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gki/download_from_ci b/gki/download_from_ci index 5ddd6b35..39c9605d 100755 --- a/gki/download_from_ci +++ b/gki/download_from_ci @@ -39,9 +39,11 @@ from abitool import get_abi_tool BASE_URL = "https://ci.android.com/builds/submitted/{build_id}/{target}/latest/raw" ARM_TARGETS = ["u-boot_qemu_arm"] ARM64_TARGETS = ["kernel_aarch64", "kernel_debug_aarch64", - "u-boot_crosvm_aarch64", "u-boot_qemu_aarch64"] + "u-boot_crosvm_aarch64", "u-boot_qemu_aarch64", + "u-boot_crosvm_locked_aarch64"] X86_64_TARGETS = ["kernel_x86_64", "kernel_debug_x86_64", - "u-boot_crosvm_x86_64", "u-boot_qemu_x86_64"] + "u-boot_crosvm_x86_64", "u-boot_qemu_x86_64", + "u-boot_crosvm_locked_x86_64"] GIT_COMMIT_LOG_LENGTH = 100 # Arguments from argparse. @@ -505,6 +507,8 @@ def update_u_boot_mainline(output_dir): crosvm_aarch64_dir = os.path.join(bootloader_dir, "crosvm_aarch64") crosvm_x86_64_dir = os.path.join(bootloader_dir, "crosvm_x86_64") + crosvm_locked_aarch64_dir = os.path.join(bootloader_dir, "crosvm_locked_aarch64") + crosvm_locked_x86_64_dir = os.path.join(bootloader_dir, "crosvm_locked_x86_64") qemu_aarch64_dir = os.path.join(bootloader_dir, "qemu_aarch64") qemu_arm_dir = os.path.join(bootloader_dir, "qemu_arm") qemu_x86_64_dir = os.path.join(bootloader_dir, "qemu_x86_64") @@ -513,6 +517,10 @@ def update_u_boot_mainline(output_dir): (old_version, old_sha) = get_binary_u_boot_version(crosvm_aarch64_u_boot) + subprocess.check_call(["git", "rm", "-rf", "*"], cwd=crosvm_locked_aarch64_dir) + download_u_boot("u-boot_crosvm_locked_aarch64", crosvm_locked_aarch64_dir) + subprocess.check_call(["git", "rm", "-rf", "*"], cwd=crosvm_locked_x86_64_dir) + download_u_boot("u-boot_crosvm_locked_x86_64", crosvm_locked_x86_64_dir) subprocess.check_call(["git", "rm", "-rf", "*"], cwd=crosvm_aarch64_dir) download_u_boot("u-boot_crosvm_aarch64", crosvm_aarch64_dir) subprocess.check_call(["git", "rm", "-rf", "*"], cwd=crosvm_x86_64_dir) |