linux/poky.git/scripts/lib, branch hardknott-3.3.4

scriptutils.py: Add check before deleting path

2021-10-07T14:10:40+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: 366070c476405a1f49e22a02c21fd99fc0ec76d9) Signed-off-by: Sai Hari Chandana Kalluri Signed-off-by: Richard Purdie (cherry picked from commit b6aa8b47e023004ffd6958d1cec18c2d9c95d77b) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

wic: keep rootfs_size as integer

2021-10-07T14:10:40+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: 5b6cd58a000c4a1eaac95e37a047838df6478305) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit d1d260dd2d196d10379ed9e238bcb34f39f3a3b7) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

wic: don't forcibly pass -T default

2021-08-26T07:32:14+00:00

This reverts part of oe-core eecbe62555, which was a previous attempt to solve the Y2038 problem. This is now solved centrally in e2fsprogs, so doesn't need to be dealt with in wic. We don't revert the commit entirely, to retain the warning if a filesystem has small inodes. (From OE-Core rev: c727397e2544dffe3cccb8be3c87cf49227560f6) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 7e8017208bed98b6c90735cb641fc9d7aedf9140) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

devtool: print a warning on upgrades if PREFERRED_VERSION is set

2021-08-14T11:01:43+00:00

(From OE-Core rev: 5fb2fb70d14b0e9f6235e5b940e9a3e1145750bb) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 0b0f53eed0aadbf45d9eead96ebf7725cc7447e6) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

checklayer: rename _find_layer_depends

2021-08-06T08:59:15+00:00

What this function does is really to find a layer, not a 'depends'. We are using this function to find a dependent layer, but the name is confusing. (From OE-Core rev: fa52d417ed578194274003c12e14cf93bdb8f7fb) Signed-off-by: Nicolas Dechesne Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit e9b7690ab30d0e7c07471034f6cb89ccc3168a11) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

checklayer: new function get_layer_dependencies()

2021-08-06T08:59:15+00:00

Split add_layer_dependencies() into 2 parts. First search for layer dependencies, and then add them to the config. That allows us to call get_layer_dependencies() independently. (From OE-Core rev: a3d5e108b6982771c99a75abf09a8210788c5be1) Signed-off-by: Nicolas Dechesne Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 08edf928aac3f2daaa0c256d4c21e56e2db72bff) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

devtool: correctly handle non-standard source tree locations in upgrades

2021-08-06T08:59:14+00:00

When S is set to a sub-directory of upstream source, the license checks and the bbappend writing (specifically, setting EXTERNALSRC) need to operate on that sub-directory. 'devtool modify' already has similar logic, and it was copied from there and adjusted. (From OE-Core rev: ddf5a7f3b644915d360f725eca8322187226f171) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit fd77e356d4507405fde352c8bba7d3842518bbdd) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

devtool: deploy-target: Fix preserving attributes when using --strip

2021-07-20T18:05:45+00:00

Commit a2db4fa127a3347fc6df31f895fb0b552669119e added ${WORKDIR}/deploy-* to PSEUDO_IGNORE_PATHS. This breaks the --strip mode since ${D} is copied to deploy-target-stripped. Use the directory devtool-deploy-target-stripped instead. [YOCTO #14451] (From OE-Core rev: 421a199ad31f7cd7fb50e3abf9cdd41fed5532dd) Signed-off-by: Florian Amstutz Signed-off-by: Richard Purdie (cherry picked from commit 02661f20faf11d0fa2f1874bd423f5d9fa7a31c9) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

Use the label provided when formating a dos partition

2021-07-06T12:02:30+00:00

Previously the bootimg-pcbios wic plugin was not respecting the --label option provided from the wks file. The plugin was setting the label to 'boot'. With this fix, the --label option is use. If no option are specified, then the default is 'boot'. (From OE-Core rev: 2fc2d0874fcb51abda249218443a71a42d9f02e9) Signed-off-by: jbouchard Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 0fd7a73c1bd2486b7a022f0f69bbcb2e0d9cb141) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

devtool upgrade: rebase override-only patches as well

2021-07-06T12:02:30+00:00

There's a number of recipes (such as nettle or glib) which were upgraded incorrectly due to rebasing only the default set of patches in main SRC_URI. Native-only or musl-only patches were not handled, causing do_patch fails and overall misery. Unfortunately, this also necessitates aborting any incomplete rebases as devtool needs to be able to return to the original branch to complete the upgrade command. Also, do not add devtool-patched-%version tags, as they are not used anywhere, and it's unclear how to extend them to cover multiple override branches. (From OE-Core rev: 00131cbc969f6a73caffe068fcb983287cbe577f) (From OE-Core rev: a4a5bebcc06637e097f074be9e401aafa8685c38) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit 588d04748dd89b5371ca9144666e97ec82dd6204) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie