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

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

2023-04-01T19:23:23+00:00

ptestresult_get_log() looked for a key called 'ptestresuls.sections', which should be 'ptestresult.sections' (From OE-Core rev: 288609a3bb2760b5bb9d86e9c130b227f9bd5039) 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

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

2023-02-24T16:41:42+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: 4ec04d14899cb7725ce908e3ef6302838275f0a8) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie (cherry picked from commit 26c74fd10614582e177437608908eb43688ab510) Signed-off-by: Steve Sakoman (cherry picked from commit 24a86d0c55ee89ae0dc77975e1d0ee02898d2289) Signed-off-by: Steve Sakoman (cherry picked from commit de7bf6689a19dc614ce4b39c84ffd825bee1b962) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

devtool: Fix _copy_file() TypeError

2023-02-13T07:44:09+00:00

when devtool finish, the _copy_file() failed. -------------------------------------------- TypeError: _copy_file() got an unexpected keyword argument 'base_outdir' -------------------------------------------- Fixes: 05f2d5d2ce00 ("devtool: finish: add dry-run option") (From OE-Core rev: a434079b7e8e23e9cf0b45f5fb56e8be7b8d885e) Signed-off-by: Xiaobing Luo Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit a45d9dc089fb2719ca69b92870917f8c0925f632) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

lib/buildstats: fix parsing of trees with reduced_proc_pressure directories

2023-01-06T17:34:54+00:00

The /proc/pressure support in buildstats is creating directories in the buildstats tree called reduced_proc_pressure, which confuses the parsing logic as that cannot be parsed as a name-epoc-version-revision tuple. Explicitly skip this directory to solve the problem. (From OE-Core rev: deb919a693e4371ace649680ca06ca6b6e3da4e2) Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni (cherry picked from commit 24f0331f0b7e51161b1fa43d4592b491d2037fe9) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

wic: swap partitions are not added to fstab

2022-11-20T08:19:10+00:00

- Regression in 7aa678ce804c21dc1dc51b9be442671bc33c4041 (From OE-Core rev: ce99d451a54b8ce46b7f9030deaba86355009b1a) Signed-off-by: Ciaran Courtney Signed-off-by: Alexandre Belloni (cherry picked from commit f1243572ad6b6303fe562e4eb7a9826fd51ea3c3) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

devtool: add HostKeyAlgorithms option to ssh and scp commands

2022-10-27T15:54:43+00:00

With the newer version of ssh in Ubuntu 22.04 we are getting errors of this type: Unable to negotiate with 192.168.7.2 port 22: no matching host key type found. Their offer: ssh-rsa Add -o HostKeyAlgorithms=+ssh-rsa to command invocation as suggested at: http://www.openssh.com/legacy.html (From OE-Core rev: 9275d23c782071382c201bca2d647f6426a64e2f) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

devtool: deploy-target: Remove stripped binaries in pseudo context

2022-02-23T23:43:42+00:00

deploy-target may fail the second time with "pseudo abort" because devtool-deploy-target-stripped is deleted outside of pseudo's fakeroot context. (From OE-Core rev: b293bcf4c312156cb57814dd71f13f8ab2a8ae80) Signed-off-by: Florian Amstutz Signed-off-by: Richard Purdie (cherry picked from commit 2338a33b690b0bbe279cde3f73764911b239cb50) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

recipetool: Fix circular reference in SRC_URI

2022-02-23T23:43:42+00:00

When creating a new recipe.bb file for a binary, don't use BP which includes the version information, instead use BPN which is just the name base Package Name. Since PB is not specified, it takes the default: PV = "1.0+git${SRCPV}" But SRCPV is defined in terms of the SRC_URI, which leads to infinite recursion (traceback below). Here are the pertinent variables which cause the recursion: SRC_URI = "git://github.com/lvc/abi-dumper;protocol=https;subdir=${BP}" BP = "${BPN}-${PV}" PV = "1.0+git${SRCPV}" SRCPV = "${@bb.fetch2.get_srcrev(d)}" def get_srcrev(d, method_name='sortable_revision'): # ... trimmed scms = [] fetcher = Fetch(d.getVar('SRC_URI').split(), d) # ... trimmed [YOCTO #14040] (From OE-Core rev: 64434ffd6d406e4c3d1e9ca2fb72fa97990346d8) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie (cherry picked from commit 3b8d43fc53ee13d39abc3b2a1f706a97fcf752aa) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

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