linux/poky.git/scripts/lib, branch langdale

filemap.py: enforce maximum of 4kb block size

2023-04-14T16:30:29+00:00

The logic in this script validates that the length of data sections are evenly divisible by the block size. On most systems the block size is 4KB and all is good. Some systems though, such as ppc64le, have a block size larger then 4KB. For example on a POWER9 based ppc64le system, the block size is 64KB. This results in this script failing with errors like this when building wic images: |440, in _do_get_mapped_ranges | assert extent_len % self.block_size == 0 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | AssertionError In this case the data section size was 268KB and the block size was 64KB, resulting in the above assert failure. Resolves https://bugzilla.yoctoproject.org/show_bug.cgi?id=15075 (From OE-Core rev: 303cc9ce3a9d7ca85542f12ebfda27eeb449e73b) Signed-off-by: Andrew Geissler Signed-off-by: Richard Purdie (cherry picked from commit 1e23b803af6991fc20e4a4e88a0ef0541399e722) Signed-off-by: Steve Sakoman

scripts/lib/buildstats: handle top-level build_stats not being complete

2023-04-04T16:46:24+00:00

If we try to parse a buildstats directory which was either aborted or is still being built then the top-level build_stats file doesn't contain an elapsed value which causes an exception: UnboundLocalError: local variable 'elapsed' referenced before assignment Default both start and elapsed to 0 so that the parse succeeds. (From OE-Core rev: 6c9ca2f2de98c84d11beccbfde7c1e26cb25dfb6) Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni (cherry picked from commit 701d985aa8f2e9c2b9c0736fa25b424f3701889e) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

lib/resulttool: fix typo breaking resulttool log --ptest

2023-03-25T23:00:14+00:00

ptestresult_get_log() looked for a key called 'ptestresuls.sections', which should be 'ptestresult.sections' (From OE-Core rev: dc5097e6692ff123a48d9af749f4e66b58056b04) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 7c8c9f7283e54bf8b1521fbaad7dceb66a8fcdbb) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

devtool/upgrade: do not delete the workspace/recipes directory

2023-03-25T23:00:14+00:00

If it exists, there is no need to delete it, and if it does not, devtool prints an ugly traceback. (From OE-Core rev: bb350782ba1a66f1cf0d3e043000f5e1535cf961) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit af82e59e8f08369aabd5fa6eb43022982d4e59a7) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

lib/buildstats: handle tasks that never finished

2023-03-06T15:09:42+00:00

If a task is aborted the buildstats file isn't complete, so calculate when the build finished and use that as a end time. (From OE-Core rev: 51e5e085400bb818d43ad82ffcf8548665bbd1d0) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 23ebaec476dc46aebe5997f025661137f3e341bd) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

wic: Fix usage of fstype=none in wic

2023-03-06T15:09:42+00:00

This allows to specify partition with fstype=none in the wks file to have partition created but without following mkfs. The none fstype is in the list already but the usage is not documented. Example; part /data --ondisk mmcblk0 --fstype=none --align 4096 --fixed-size 512 will create a partition, filesystem may be created manualy on the host or target and data will be preserved if the device is reflashed using same wks. Works with bmaptool and probably does not work with dd. Use case is persistent filesystem/data between reflashing of the image. (From OE-Core rev: 5f7239eebe61aabbd3dbf4e6e1cf703c71273a35) Signed-off-by: Pavel Zhukov Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 351cb64da37aa43113e5192605d04436652aa3b8) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

meta: remove True option to getVar and getVarFlag calls (again)

2023-02-15T21:47:00+00:00

* True is default since 2016 and most layers were already updated not to pass this parameter where not necessary, e.g. oe-core was updated couple times, first in: https://git.openembedded.org/openembedded-core/commit/?id=7c552996597faaee2fbee185b250c0ee30ea3b5f Updated with the same regexp as later oe-core update: https://git.openembedded.org/openembedded-core/commit/?id=9f551d588693328e4d99d33be94f26684eafcaba with small modification to replace not only d.getVar, but also data.getVar as in e.g.: e.data.getVar('ERR_REPORT_USERNAME', True) and for getVarFlag: sed -e 's|$d\.getVarFlag \?$( \?$[^,()]*, \?[^,()]*$, \?True)|\1(\2)|g' \ -i $(git grep -E 'getVarFlag ?$ ?([^,()]*), ?([^,()]*), ?True$' \ | cut -d':' -f1 \ | sort -u) (From OE-Core rev: f12fcb8a3f3d11c981c223569f8f40ec705c837a) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie (cherry picked from commit 26c74fd10614582e177437608908eb43688ab510) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

devtool: process local files only for the main branch

2023-01-15T11:05:19+00:00

devtool modify/upgrade are not currently equipped to handle conditional local files in SRC_URI, and provide only the main no-override set in a workspace under source/component/oe-local-files/ (this is done via meta/classes/devtool-source.bbclass). On the other hand, updating the changes from workspace into a recipe is run iteratively against all overrides; this works for patches (as they all are directed into their own override branches in the workspace git source tree), but breaks down when trying to match local files in a workspace against local files in overridden SRC_URI lists, resulting in bad recipe breakage. (there's an additional twist here: existing code has a guard against this but the guard relies on metadata in workspace .bbappend that is only there in modify operations, but not upgrades. This commit replaces the guard with a general check that will work everywhere). Implementing multiple sets of local files is significant work; let's for now simply not touch local files in recipes except when on the no-override variant. Also, adjust the selftest cases to include conditional local files in sample recipes, so the situation is covered by the tests. (From OE-Core rev: b2dfb2fe86de887d0239078ded0a4f9e8c677d83) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 3a8654b860fa98f94e80c3c3fff359ffed14bbe7) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

devtool/upgrade: correctly handle recipes where S is a subdir of upstream tree

2023-01-06T17:33:19+00:00

'devtool modify' writes additional settings to workspace .bbappend so that this can be handled correctly, but 'devtool upgrade' does not. This adds the missing settings. In particular, local files should not anymore mysteriously disappear from SRC_URIs on upgrades. (From OE-Core rev: 31a778f1a6a77ee9b44b3fd995046bf6dd0af835) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit 0817aa5537a8d7cc9591c53dfaa1d225f4c327f7) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

yocto-check-layer: Allow OE-Core to be tested

2022-12-23T23:05:57+00:00

For unknown reasons we've never seemingly run the check layer script against OE-Core itself. This isn't entirely straightforward as the core layer is a bit of a special case, we can't for example compare signatures against ourselve and we can't remove core from bblayers.conf. Core does have distro, machine and software components too, in the case of distro, our fallback default settings. Whilst the qemu machines could be split into a seperate layer directory, core wouldn't then parse at all standalone due to the lack of any machine so it seems a bit pointless to do that. These changes tweak the script to handle core's special cases, specifically to allow distro and machine directories and to account for the README placed a directory level higher than other layers. (From OE-Core rev: 4efc5ec83bc97e5731284ef3879f89fda4b8ef0b) Signed-off-by: Richard Purdie Signed-off-by: Alexandre Belloni (cherry picked from commit ba312ed228507d05f280aeb96819d671b01400b8) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie