losetup: support building rootfs images with 4096 byte sector sizes (!1725)

Adds an optional deviceinfo variable, `deviceinfo_rootfs_image_sector_size`,
which specifies the logical sector size of the device's storage.

Some devices made after 2016 with UFS storage uses 4096 byte sectors
instead of the normal 512 bytes. The partition table in our rootfs
must match, otherwise the root filesystem won't mount on the device.

This change passes the sector size to `losetup` when creating the image
if the deviceinfo specifies it, so the image will have the correct
sector size.

If the deviceinfo doesn't specify the new option, the behaviour
is the same as previous versions of pmbootstrap.

Note that the sector size option only works on Linux 4.14 and above,
so pmbootstrap should be run on a >4.14 computer when installing to
devices with non-standard sector size.

To find if a device needs this parameter, run `fdisk -l` on the device.
If the output shows

`Note: sector size is 4096 (not 512)`

then add `deviceinfo_rootfs_image_sector_size="4096"` to the deviceinfo.

This is needed by the Pixel 3 XL (google-crosshatch) port.

See https://gitlab.com/postmarketOS/pmbootstrap/issues/1696.
This commit is contained in:
Zhuowei Zhang 2018-12-10 17:08:02 -08:00 committed by Oliver Smith
parent 5102d48064
commit 1efe288fe2
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
2 changed files with 8 additions and 1 deletions

View File

@ -262,6 +262,7 @@ deviceinfo_attributes = [
"flash_fastboot_max_size",
"flash_fastboot_vendor_id",
"flash_sparse",
"rootfs_image_sector_size",
# weston
"weston_pixman_type",

View File

@ -52,7 +52,13 @@ def mount(args, img_path):
# Mount and return on success
init(args)
pmb.chroot.root(args, ["losetup", "-f", img_path], check=False)
losetup_cmd = ["losetup", "-f", img_path]
sector_size = args.deviceinfo["rootfs_image_sector_size"]
if sector_size:
losetup_cmd += ["-b", str(int(sector_size))]
pmb.chroot.root(args, losetup_cmd, check=False)
if device_by_back_file(args, img_path):
return