linux/poky.git/scripts/lib/wic, branch zeus

wic: align layer plugin path

2020-04-29T15:11:56+00:00

wic look for external layer source plugin under scripts/lib/ while other tools look for lib/. allow wic to check for source plugin at both scripts/lib/ and lib/ to align with other tools while avoid breaking any existing source plugin in external layer. [YOCTO #13056] (From OE-Core rev: 8351cb19e8a83157143b1df61cd9bbb71282e9fc) Signed-off-by: Lee Chee Yang Signed-off-by: Richard Purdie (cherry picked from commit 986baff26bd96a6265f5fe2d631818fff9f66374) Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie

wic/direct: reserve 2 sector for extended partition

2020-03-30T16:41:56+00:00

extended partition should reserve at least 2 unallocated sectors between the start of the extended partition and the start of a logical partition. [YOCTO #13658] (From OE-Core rev: 884c8a0e50a49bdca5e048197a9dc0ff37cc8d1a) (From OE-Core rev: 0743dcd0cd70dee87a49d3bcd017168352e60982) Signed-off-by: Chee Yang Lee Signed-off-by: Richard Purdie (cherry picked from commit 590555e3b8ccbd94b628aa6778adea7f4538d966) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

wic/engine: lets display an error not a traceback

2020-03-16T16:44:53+00:00

If the requested partition does not exist in this request "wic ls {path}:pnum" display a nice message not a trackback Also fix displaying the pnum and not "%s" (From OE-Core rev: 29a1d9bed5bf7ed024870a0323f9afdf88346e4d) Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie (cherry picked from commit 15d1722950a22649905cf8a5789d3cfe48a2a892) Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie

wic/filemap: If FIGETBSZ iotctl fail, failback to os.stat

2020-01-28T11:51:03+00:00

Some file systems don't support fetching the block size (notably the file system Docker uses for containers), so if iotctl() fail, try to use failback via os.stat() to get block size. (From OE-Core rev: 996013b4e5d3cd1c054e87539ac1a8d95581a87f) Signed-off-by: Kalle lampila Signed-off-by: Richard Purdie (cherry picked from commit e219f5175177a640dd62833082ea19adc1c13d42) Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie

wic/engine: use 'linux-swap' for swap file system

2019-10-29T09:08:18+00:00

[YOCTO #13312] see https://bugzilla.yoctoproject.org/show_bug.cgi?id=13312 wic/engine.Disk._get_part_image was looking at variable fstypes for supported fstype which is 'swap' but image build with 'linux-swap'. supported fstype should be 'linux-swap'. (From OE-Core rev: 759a37e315d72e462a617f1cda326b8f198e3d4e) Signed-off-by: Chee Yang Lee Signed-off-by: Richard Purdie (cherry picked from commit 7e6da22fe4faf841bcec02e55f376b4dae04d6a8) Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie

wic/rawcopy: Support files in sub-directories

2019-10-29T09:08:17+00:00

If the source file is located in a subdirectory of DEPLOY_DIR rawcopy will currently fail in sparse_copy function on open(dst_fname, 'wb'), as the parent directory for destination file does not exist. This patch helps to avoid that by recursively creating parent directories. (From OE-Core rev: 03796926046e5b5b57349d66de6bb009a34d2cb2) Signed-off-by: Eugene Smirnov Signed-off-by: Richard Purdie (cherry picked from commit 073c435644091c2801e45c6d02afa917de575082) Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie

wic/direct: Partition numbering is broken for MBR primary partition #4

2019-10-08T10:22:24+00:00

When wks describes extra partitions that aren't in the partition table (e.g. boot loader) and exactly four primary MBR partitions, the last partition gets added to fstab as partition #5 instead of #4. [YOCTO #13560] (From OE-Core rev: 7537580b3dd21bd512fb26e56e92b6553c549fa8) Signed-off-by: Michael Cooper Signed-off-by: Richard Purdie

wic: Using the right rootfs size during prepare_rootfs

2019-09-27T12:02:16+00:00

The commit 8e48b4d6c4 makes wic ignores IMAGE_ROOTFS_SIZE for rootfs size and makes it uses the computed one only. Re-add support for IMAGE_ROOTFS_SIZE variable and compute roots size only if the former is not defined. Moreover the size of a provided directory with --rootfs-dir="" in the .wks file should always be computed on the fly, else every partition will be constrained to be the same size as what ever value was in ROOTFS_SIZE. (From OE-Core rev: 0217a0392b8cc534fcc0d760b7663a1845b306f5) Signed-off-by: Alessio Igor Bogani Signed-off-by: Jason Wessel Signed-off-by: Richard Purdie

qemuriscv: Generate a wic rootFS with a larger filesystem

2019-09-03T08:55:50+00:00

This allows us to generate a rootFS with a large filesystem for use with QEMU. (From OE-Core rev: e06439200e44999c1e2f88d7d6c651da13698ca7) Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie

wic: Make disk partition size consistently computed

2019-08-12T15:23:57+00:00

When using different root directories with a wks file wic is using the value from the original ROOTFS_SIZE which is not correct. Example: Number Start End Size File system Name Flags 1 20.5kB 318MB 318MB fat16 otaefi legacy_boot, msftdata 2 318MB 636MB 318MB ext4 otaboot 3 636MB 1709MB 1074MB ext4 otaroot 4 1709MB 2027MB 318MB ext4 otaboot_b 5 2027MB 3101MB 1074MB ext4 otaroot_b 6 3101MB 5249MB 2147MB ext4 fluxdata The partitions 1, 2, and 3 incorrectly inherit the size, instead of using a computed size. With the patch applied it is working properly: Number Start End Size File system Name Flags 1 20.5kB 14.5MB 14.5MB fat16 otaefi legacy_boot, msftdata 2 14.5MB 65.3MB 50.8MB ext4 otaboot 3 65.3MB 1139MB 1074MB ext4 otaroot 4 1139MB 1190MB 50.8MB ext4 otaboot_b 5 1190MB 2264MB 1074MB ext4 otaroot_b 6 2264MB 4411MB 2147MB ext4 fluxdata As for the removal of the bb.warn, if the size is not specified, it is not something to warn the end user about. Some of my default images make use of the head room + a computed directory size or while generating images. (From OE-Core rev: 8e48b4d6c4d0ed213089a7449fea63aa0656e786) Signed-off-by: Jason Wessel Signed-off-by: Richard Purdie