linux/poky.git/scripts/lib, branch honister-3.4.3

devtool: explicitly set main or master branches in upgrades when available

2022-03-10T16:39:50+00:00

In particular this resolves devtool's inability to pick a branch when the same tagged commit is avaiable in main and in a release maintenance branch. Thanks to Peter Kjellerstedt for the suggestion. (From OE-Core rev: e2f27f05018a7f7882166b1b82ffd4b443ca9dc0) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit bcb21ee2760a2c76039412a56c6cda43fbf96fd0) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

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

2022-02-24T11:12:39+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: 23b0efb5428343b395a3abf76c84b21b08bbc33c) Signed-off-by: Florian Amstutz Signed-off-by: Richard Purdie (cherry picked from commit 2338a33b690b0bbe279cde3f73764911b239cb50) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

recipetool: Fix circular reference in SRC_URI

2022-02-24T11:12:39+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: 1deb4e4b13fa37a480bddd5ab930fcdfe0475761) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie (cherry picked from commit 3b8d43fc53ee13d39abc3b2a1f706a97fcf752aa) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

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

2022-01-12T22:03:31+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: 6b9c12fab3b1319b6b0e59ed596d4a586a678ef2) Signed-off-by: Richard Purdie (cherry picked from commit 655cd3f614d736416eab0d708b7c49674bf5c977) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

recipetool: Set master branch only as fallback

2021-12-17T10:02:39+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: 48cbe51ca30d35b1355c8c0247eaa21520ab7f24) Signed-off-by: Stefan Herbrechtsmeier Signed-off-by: Richard Purdie (cherry picked from commit 34ece8030e7a6a100b5e3e7b94e6c786c0e199a6) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

recipetool: extend curl detection when creating recipes

2021-12-13T23:02:49+00:00

If a configure.ac uses LIBCURL_CHECK_CONFIG it wants curl. (From OE-Core rev: d647fa0136bde43544b142136f519b597ed749c1) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 16e830ca1352cee61e4ae4b98b1203f849bf71f3) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

recipetool: handle GitLab URLs like we do GitHub

2021-12-13T23:02:49+00:00

GitHub URLs are automatically transformed to git: fetches, so handle GitLab URLs too. (From OE-Core rev: a1284b80c48328845d67c2bbc9f45207b71264d3) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 651fb951819840fe122458ddbd852ee6c7ec0455) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

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

2021-12-13T23:02:49+00:00

(From OE-Core rev: e760a57cb326a5b645fdcf6f3247d8adec896d9a) Signed-off-by: Dhruva Gole Signed-off-by: Richard Purdie (cherry picked from commit 8ea17456ae5318ed7a3b4c8f75c8441456d8b979) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

wic: support rootdev identified by partition label

2021-12-13T23:02:49+00:00

We already support specifying the rootfs by PARTUUID. This adds general support for letting the kernel find the rootfs by PARTLABEL. (From OE-Core rev: c3d91b1a2b2ad87c2715a7793f1f408e3b3ba8ef) Signed-off-by: Adriaan Schmidt Signed-off-by: Richard Purdie (cherry picked from commit 2fb247c5ecf057bb96649a3c0234794b4991c050) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

wic: use shutil.which

2021-12-13T23:02:49+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: 33c5899ab2fcb48245ef12223bda6c52fa2e48fa) Signed-off-by: Mingli Yu Signed-off-by: Richard Purdie (cherry picked from commit 3966cbf5c8a2dbc3a4f0f3eefdbeeb83f522bf87) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie