linux/poky.git/scripts/lib, branch yocto-3.1.14

wic: use shutil.which

2022-01-22T17:56:53+00:00

Use shutil.which to find the executable instead to silence the below warning: $ cat tmp/work/intel_x86_64-poky-linux/core-image-base/1.0-r5/temp/log.do_image_wic [snip] DEBUG: Executing shell function do_image_wic /path/layers/oe-core/scripts/wic:27: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives from distutils import spawn INFO: Creating image(s)... [snip] [RP: Added conversion for missed function reference] (From OE-Core rev: 488815681466d5e4c7640df5281fa6e1f9b4c75e) Signed-off-by: Mingli Yu Signed-off-by: Richard Purdie (cherry picked from commit 3966cbf5c8a2dbc3a4f0f3eefdbeeb83f522bf87) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

wic: misc: Do not find for executables in ASSUME_PROVIDED

2022-01-22T17:56:53+00:00

Executables like tar won't be available on the native sysroot, as they are part of the ASSUME_PROVIDED variable. Cc: Paul Barker (From OE-Core rev: eab485069809c991433b9e1b8e4223a555e4d7f9) Signed-off-by: Ricardo Ribalda Delgado Signed-off-by: Richard Purdie (cherry picked from commit 2f574d535f8665b26dab65c14668cf8fc7b751c0) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

scripts: Update to use exec_module() instead of load_module()

2022-01-11T22:28:38+00:00

This is deprecated in python 3.12 and Fedora 35 is throwing warnings so move to the new functions. (From OE-Core rev: c0710d4ffb6c11083daf77fe24129d879f270591) Signed-off-by: Richard Purdie (cherry picked from commit 655cd3f614d736416eab0d708b7c49674bf5c977) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

recipetool: Set master branch only as fallback

2021-12-14T22:49:22+00:00

The commit 'meta/scripts: Manual git url branch additions (dc53fe75cc)' sets the branch= parameter too early to master and thereby breaks the -B/--srcbranch option. ERROR: branch= parameter and -B/--srcbranch option cannot both be specified - use one or the other (From OE-Core rev: 2bc6deb34aee7542d7086c24b166083c562a6a01) Signed-off-by: Stefan Herbrechtsmeier Signed-off-by: Richard Purdie (cherry picked from commit 34ece8030e7a6a100b5e3e7b94e6c786c0e199a6) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

wic:direct.py: ignore invalid mountpoints during fstab update

2021-12-14T22:49:22+00:00

wic fstab-update creates invalid entries for partitons that are not supposed to be mounted from userspace eg u-boot partitions. The following lines were added to fstab on a rock-pi-4: /dev/mmcblk1p1 loader1 vfat defaults 0 0 /dev/mmcblk1p2 reserved1 vfat defaults 0 0 /dev/mmcblk1p3 reserved2 vfat defaults 0 0 /dev/mmcblk1p4 loader2 vfat defaults 0 0 /dev/mmcblk1p5 atf vfat defaults 0 0 /dev/mmcblk1p6 /boot vfat defaults 0 0 With this patch only valid entries should be added /dev/mmcblk1p6 /boot vfat defaults 0 0 (From OE-Core rev: 3c8e50b073a1505cc3586ca51dfe1e75338feafc) Signed-off-by: MarkusVolk Signed-off-by: Richard Purdie (cherry picked from commit 7aa678ce804c21dc1dc51b9be442671bc33c4041) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

scripts/checklayer/common.py: Fixed a minor grammatical error

2021-12-08T20:28:01+00:00

(From OE-Core rev: eee2103640d15011cb40d719769ecb4ce42095fb) Signed-off-by: Dhruva Gole Signed-off-by: Richard Purdie (cherry picked from commit 8ea17456ae5318ed7a3b4c8f75c8441456d8b979) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

scripts/lib/wic/help.py: Update Fedora Kickstart URLs

2021-12-02T16:53:07+00:00

The URLs describing Kickstart are no longer valid and do not redirect to the correct location. Update them with the correct location. (From OE-Core rev: f01e3e8ece228a355cb91cbd043e0fe7fa951ebf) Signed-off-by: Jon Mason Signed-off-by: Richard Purdie (cherry picked from commit e5ac75f93c8128b0761af5fee99e8603ddd1657d) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

meta/scripts: Manual git url branch additions

2021-11-11T10:54:32+00:00

Following the scripted conversion adding branches to git:// SRC_URI entries, add the remaining references, mainly in the selftests and recipetool. (From OE-Core rev: 38fc0807eea14dc12610da4ba73c082d5a4b0744) Signed-off-by: Richard Purdie (cherry picked from commit 5340c0d688036c1be6c938f05d8a8c1e3b49ec38) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

scriptutils.py: Add check before deleting path

2021-10-23T22:14:16+00:00

Add a check before deleting path when using recipetool commands to avoid the following type of errors: Traceback (most recent call last): File "/sources/core/scripts/lib/scriptutils.py", line 218, in fetch_url shutil.rmtree(path) File "/usr/local/lib/python3.7/shutil.py", line 476, in rmtree onerror(os.lstat, path, sys.exc_info()) File "/usr/local/lib/python3.7/shutil.py", line 474, in rmtree orig_st = os.lstat(path) FileNotFoundError: [Errno 2] No such file or directory: '/build/tmp/work/recipetool-usg7o81n/work/recipe-sysroot' ERROR: Command 'script -e -q -c "recipetool --color=always create --devtool -o /tmp/devtool5sq_op37 'file:///' -x /build/workspace/sources/devtoolsrcxc1b9zjq -N test" /dev/null' failed (From OE-Core rev: a21d3d8f6da9fbb71f484343244cc3a63a346337) Signed-off-by: Sai Hari Chandana Kalluri Signed-off-by: Richard Purdie (cherry picked from commit b6aa8b47e023004ffd6958d1cec18c2d9c95d77b) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

wic: keep rootfs_size as integer

2021-09-29T23:02:22+00:00

The corrected line accidentally converted it to float, which causes problems later on with python 3.10: | File "/home/alex/development/poky/scripts/lib/wic/partition.py", line 278, in prepare_rootfs_ext | os.ftruncate(sparse.fileno(), rootfs_size * 1024) | TypeError: 'float' object cannot be interpreted as an integer (From OE-Core rev: 098195ecefafa4082bb5d27ff1c8b1b7b8e222d5) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit d1d260dd2d196d10379ed9e238bcb34f39f3a3b7) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie