linux/poky.git/scripts/lib/wic/plugins, branch gatesgarth-24.0.3

wic: debug mode to keep tmp directory

2021-02-26T15:30:39+00:00

files in wic tmp directory can be usefull for debugging, so do not remove tmp directory when wic create run with debugging mode (-D or --debug). also update wic.Wic.test_debug_short and wic.Wic.test_debug_long to check for tmp directory. [YOCTO#14216] (From OE-Core rev: 04d334d5bc5353c39c5059d25d97f111a9e368d9) Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie (cherry picked from commit a122e2418b67d38f691edcf8dd846c167d6b4fa9) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

wic: Optimise fstab modification for ext2/3/4 and msdos partitions

2021-01-27T09:32:45+00:00

The fix for [Yocto #13994] required the rootfs directory to be copied (using hardlinks if possible) when modifying the fstab file under wic. We can optimise this copy away for filesystems where we have the tools to modify the contents of the partition image after it is created. For ext2/3/4 filesystems we have the debugfs tool and for msdos/vfat filesystems we have the mcopy tool. So for any of these filesystems we skip the modification of the fstab file in the rootfs directory (and skip the associated copy unless it is otherwise necessary) and update the contents of fstab directly in the partition image. (From OE-Core rev: a56b9dbfeb410d235b5af2c5a846b3f1360d2d1d) Signed-off-by: Paul Barker Signed-off-by: Richard Purdie (cherry picked from commit 5fb8ae0e9159597d7eaa9307a3a8543800bf9405) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

wic: Copy rootfs dir if fstab needs updating

2021-01-27T09:32:45+00:00

By default, wic updates the /etc/fstab in the rootfs to include details of additional partitions described in the selected wks file. If this modification is performed in place, other tasks which create an image file from the rootfs directory (e.g. do_image_tar and do_image_ext4) will pick up the modified fstab file which would not be appropriate for those images as they do not include the additional partitions described in the wks file. wic does undo modifications to the fstab file once it has finished creating the filesystem image, however this leaves open a race condition if one of the other tasks reads the contents of the fstab file from the rootfs directory between the point where wic modifies the fstab file and the point where wic restores the files original content. This could be solved by adding a lockfile for tasks which use the rootfs directory to ensure that no other such task is reading the rootfs directory while do_image_wic is running. This would serialize several do_image_* tasks and result in slower builds, especially for large images. Another drawback of this solution is that it is hard to selectively optimise - adding lockfiles to do_image_* tasks would result in these tasks always being serialized even if no fstab modification will take place. An alternative solution is to copy the rootfs directory when fstab needs to be modified. The code to do this in wic already exists as it is needed when including or excluding content in the rootfs. This still results in an impact on build times but the copy uses hardlinks if possible (so little data is actually copied) and we can make selective optimisations to improve things. The rootfs copy will only take place if fstab modification is required (or if it was already needed to include or exclude rootfs content). We can also follow up with further optimisations after this commit. So this second solution is chosen. Fixes [Yocto #13994] (From OE-Core rev: 39f98ef8c1f6b0259deb43ea902f5ac8e5b069cd) Signed-off-by: Paul Barker Signed-off-by: Richard Purdie (cherry picked from commit ce682a73b7447652f898ce1d1d0416a456df5416) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

wic: Update pseudo db when excluding content from rootfs

2021-01-27T09:32:45+00:00

To exclude content from the rootfs, wic makes a copy (using hardlinks if possible) of the rootfs directory and associated pseudo db, then removes files & directories as needed. However if these files and directories are removed using the python functions os.remove and shutil.rmtree, the copied pseudo db will not be updated correctly. For files copied from the original rootfs, if hardlinks were used successfully when copying the rootfs this should mean that the relevant inodes can't be reused and so the risk of pseudo aborts should be avoided. However, this logic doesn't apply for directories (as they can't be hardlinked) or for files added via the '--include-path' argument (as they weren't present in the original rootfs) and so there remains some risk of inodes being reused and the pseudo db becoming corrupted. To fix this, use the 'rm' command under pseudo when removing files & directories from the copied rootfs to ensure that the copied pseudo db is updated. (From OE-Core rev: 9f33aa6f1dd66b1b6990b256ad822fa4cf8daa94) Signed-off-by: Paul Barker Signed-off-by: Richard Purdie (cherry picked from commit d5db7e268947f0392c2126137571a44acd29ccd6) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

wic: Ensure internal workdir is not reused

2021-01-27T09:32:45+00:00

If a path is specified for the internal wic working directory using the -w/--workdir argument then it must not already exist. Re-using a previous workdir could easily result in rootfs and intermediate files from a previous build being added to the current image. (From OE-Core rev: 365b10a95ac0b04ca48a53e55cf5a0a330f1bc2f) Signed-off-by: Paul Barker Signed-off-by: Richard Purdie (cherry picked from commit 2e40c8d4109024ff704c5ce40d98050ca7f34dd5) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

wic: Add workdir argument

2021-01-27T09:32:45+00:00

This allows the path for the temporary workdir used by wic to be set when running wic from bitbake or directly from the command line. (From OE-Core rev: 6136e1312fc69b1b6196aa2fb8986d99ad46e7a1) Signed-off-by: Paul Barker Signed-off-by: Richard Purdie (cherry picked from commit 2e7314ac3a3cab89de93c932e8efc75de0feb0a7) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

wic/direct/kparser: ensure fsuuid for vfat and msdos align with format

2021-01-12T14:25:13+00:00

vfat/msdos filesystem should have fsuuid in format 0xYYYYYYYY where "0x" in front follow with 8 hexadecimal number in uppercase. In wic, when using custom fsuuid for vfat/msdos partition in wks, it is able to set the value in any length, with or without leading "0x". This can cause fsuuid missaligned when fstab updates, fstab expect exactly 10 character fsuuid for vfat/msdos partition and all in uppercase. if custom fsuuid for vfat/msdos is set, check the length and format, error if it exceed the format size. Amend it so it is align with format 0xYYYYYYYY. This is done before image create and fstab update to ensure the fsuuid are same in all followup process. if custom fsuuid length less than expected, fill in "0". [YOCTO #14161] (From OE-Core rev: e71365fe128fe5e7d01232a1da62a3989e0d8eb2) Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie (cherry picked from commit d9686ae511ef10a504becfd81bfe296b788e1456) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

wic/bootimg-efi: IMAGE_EFI_BOOT_FILES variable added to separate bootimg-efi and bootimg-partition

2020-09-15T10:53:28+00:00

Due to recent changes in bootimg-efi to include IMAGE_BOOT_FILES, when both bootimg-partition and bootimg-efi occur in a single .wks and IMAGE_BOOT_FILES are defined, files listed in IMAGE_BOOT_FILES will be duplicated in both partition. Since IMAGE_BOOT_FILES are crucial for bootimg-partition, but optional for bootimg-efi, hence allowing bootimg-efi to have the option to ignore it. The new variable, IMAGE_EFI_BOOT_FILES, was added to help handle this issue. Its basic usage is the same as IMAGE_BOOT_FILES. Usage example: ${IMGDEPLOYDIR}/${IMAGE_BASENAME}-${MACHINE}.ext4;rootfs.img \ This commit is also squashed with the updated testcase to cover for this change. [YOCTO #14011] (From OE-Core rev: 945339e06b273df1935cfd784f548ef57e0b7f4c) Signed-off-by: Khairul Rohaizzat Jamaluddin Signed-off-by: Richard Purdie

wic: Add 512 Byte alignment to --offset

2020-08-22T14:46:55+00:00

Allows the --offset argument to use the "s" or "S" suffix to specify that it is reporting the number of 512 byte sectors. This is required for some SoCs where the mask ROM looks for an item at a sector that isn't aligned to a 1KB boundary. (From OE-Core rev: 938595d1dc4abaf5f7f3a7900add3f0492b805d0) Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie

wic: fix typo

2020-08-06T14:12:39+00:00

(From OE-Core rev: 9ab4c4571d899d2eefcd2fc53af0851863f29008) Signed-off-by: Daniel Ammann Signed-off-by: Richard Purdie