linux/poky.git/scripts, branch yocto-4.1.3

runqemu: kill qemu if it hangs

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

qemu doesn't always behave well and can hang too. kill it with force if it was still alive. Move clean up commands into cleanup() function. (From OE-Core rev: 9047a07bc8a8c440cb30c6bb49710362eae41330) Signed-off-by: Mikko Rapeli Signed-off-by: Alexandre Belloni (cherry picked from commit 079c2935d2f585ce49e1c7daab2155fcf0094c48) 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

combo-layer: add sync-revs command

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

When starting to use combo-layer, or if someone else is using it too, the local last_revision may be incorrect. This command will forcibly update the last_revision config values to the latest SHA on the remote branch that is tracked. (From OE-Core rev: 8c681c9e56065fac26088b4d2c7f22c09088a9b5) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 2bb5d12ecd1b0273983f7c05699f34dd64b11c25) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

combo-layer: dont use bb.utils.rename

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

Bitbake may not be configured, and bb isn't imported anyway. Instead just use os.rename(), and take the filename from the file object instead of duplicating logic. (From OE-Core rev: acc824693463a06c77951ce913dbd356e48f711e) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 528f4fb3683d048537604e4562ea758968060d62) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

combo-layer: remove unused import

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

(From OE-Core rev: ae6c752a7056b956e83a6ff1c351bdaa1c53a7fd) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit ebfab6c3034d41252d19c6e1a0ba79072aa51146) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie