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

recipetool: Fix circular reference in SRC_URI

2022-02-20T15:32:27+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: 5e5874d9b8f954771edb4ee3725bb31c1c5a70f2) 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-25T12:07:01+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: 85194f3264551adfffd168dd55e7f2a77f517a55) 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-15T07:40:29+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: 15919898fa8dc40f4fe9c668d56e1d2afd52c894) 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-15T07:40:29+00:00

If a configure.ac uses LIBCURL_CHECK_CONFIG it wants curl. (From OE-Core rev: 39e5b3b37c3a0116fb01be6183b320d9afea3bfe) 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-15T07:40:29+00:00

GitHub URLs are automatically transformed to git: fetches, so handle GitLab URLs too. (From OE-Core rev: 7cc06b578612e4965add12181d76dadc81a9e873) 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-15T07:40:29+00:00

(From OE-Core rev: f4b21b2de13834b8308ef5a247cd632ef67dc591) 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-15T07:40:29+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: e10d5f31566285d66bbab29f5e2d9d8a79ee8e85) 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-05T12:35:43+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: 17e2839001076f7fc56a7cf62196b087351083f1) 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

scripts/lib/wic/help.py: Update Fedora Kickstart URLs

2021-11-24T21:12:46+00:00

The URLs describing Kickstart are no longer valid and do not redirect to the correct location. Update them with the correct location. (From OE-Core rev: cb00474c1a3074cd36b9bd69f3563180784f5513) Signed-off-by: Jon Mason Signed-off-by: Richard Purdie (cherry picked from commit e5ac75f93c8128b0761af5fee99e8603ddd1657d) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie

meta/scripts: Manual git url branch additions

2021-11-21T11:40:35+00:00

Following the scripted conversion adding branches to git:// SRC_URI entries, add the remaining references, mainly in the selftests and recipetool. (From OE-Core rev: 87ac0c0a643cca436784dfcd86472adcf2e04130) Signed-off-by: Richard Purdie (cherry picked from commit 5340c0d688036c1be6c938f05d8a8c1e3b49ec38) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie