diff options
| author | Ramji Jiyani <ramjiyani@google.com> | 2023-11-02 10:26:16 +0000 |
|---|---|---|
| committer | Ramji Jiyani <ramjiyani@google.com> | 2023-11-02 10:32:47 +0000 |
| commit | a216ac35e01fecbda5f37dda3ff67ae04077fc9e (patch) | |
| tree | 3a5acc08c8096304c1bae112e8b8b791ce09f894 | |
| parent | ebfbdd4073c70e4b71609c13a6875a9a127a0536 (diff) | |
| download | build-a216ac35e01fecbda5f37dda3ff67ae04077fc9e.tar.gz | |
kleaf: system_dlkm: Name ext4 image as system_dlkm.img
Enabling building both erofs and ext4 image changed the
legacy image from system_dlkm.img to system_dlkm.ext4.img.
This may break the scripts downloading this image from
kernel build artifacts. For backward compatibility on the
released kernel artifacts name ext4 images with legacy
name system_dlkm.img.
Fixes: ebfbdd4073c7 ("kleaf: system_dlkm: Build ext4 & erofs images for common kernels")
Bug: 297407875
Test: TH, Manual image verification in dist
Change-Id: Ia5aa7be37eff2801dfd50e8354213c2614465242
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
| -rw-r--r-- | kleaf/impl/image/system_dlkm_image.bzl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kleaf/impl/image/system_dlkm_image.bzl b/kleaf/impl/image/system_dlkm_image.bzl index 849dd42..73ec982 100644 --- a/kleaf/impl/image/system_dlkm_image.bzl +++ b/kleaf/impl/image/system_dlkm_image.bzl @@ -104,7 +104,8 @@ def _system_dlkm_image_impl(ctx): outputs = [] outputs_to_compare = [] for fs_type in system_dlkm_fs_types: - if system_dlkm_fs_type: + # Name ext4 image as system_dlkm.img for backward compatibility + if system_dlkm_fs_type or fs_type == "ext4": system_dlkm_img = ctx.actions.declare_file("{}/system_dlkm.img".format(ctx.label.name)) system_dlkm_img_name = "system_dlkm.img" else: |