Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d09dcb2 authored by JP Abgrall's avatar JP Abgrall
Browse files

releasetools: only allow yaffs to have no userdata image size (fix build) 



In the past, there was an exception for ext-base fs types to
deal with the lack of image size.
Back then it was only yaffs and ext*.
So now we explicitely only allow yaffs to have no userdata image size.

Change-Id: Ie354ee6222a58228dbcce2c6934971a0737422af
Signed-off-by: default avatarJP Abgrall <jpa@google.com>
parent 5bc22c96

tools/releasetools/img_from_target_files.py

+3 −2
Original line number Diff line number Diff line
@@ -154,8 +154,9 @@ def AddUserdata(output_zip): 


  image_props = build_image.ImagePropFromGlobalDict(OPTIONS.info_dict,

                                                    "data")

  # If no userdata_size is provided for extfs, skip userdata.img.

  if (image_props.get("fs_type", "").startswith("ext") and

  # We only allow yaffs to have a 0/missing partition_size.

  # Extfs, f2fs must have a size. Skip userdata.img if no size.

  if (not image_props.get("fs_type", "").startswith("yaffs") and

      not image_props.get("partition_size")):

    return