linux/poky.git/scripts/lib/recipetool, 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

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

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

recipetool: create: only add npmsw url if required

2021-01-16T22:39:36+00:00

Before adding a npmsw fetcher to a recipe we should first check if the generated shrinkwrap file contains dependencies. (From OE-Core rev: ef153ad36d0299e83a03af8f207686d0d8a238b3) Signed-off-by: Kamel Bouhara Signed-off-by: Richard Purdie

scripts/lib/recipetool/create.py: fix regex strings

2020-07-12T21:39:41+00:00

Python now expects regex strings to be prepended with r. Silence pylint/autopep8 and similar warnings by identifying these regex patterns as... regex patterns. (From OE-Core rev: 0eae98a369d80340e48dc690d09a1364cde97973) Signed-off-by: Tim Orling Signed-off-by: Richard Purdie

recipetool: create: fix SRCBRANCH not being passed to params

2020-06-17T15:31:52+00:00

When explicitly passing a branch using --srcbranch in 'devtool add' or 'recipetool create', the branch name is not included in the params of bb.fetch2.encodeurl and default 'master' branch is used instead. (From OE-Core rev: 0424df825f1e509faf6cd44403c0736bb91b57c3) Signed-off-by: Tuomas Salokanto Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

recipetool: Fix list concatenation when using edit

2020-06-15T13:53:45+00:00

If there are multiple appends, ensure we concatenate compatible things: Traceback (most recent call last): File "/home/akiernan/poky/scripts/recipetool", line 111, in ret = main() File "/home/akiernan/poky/scripts/recipetool", line 100, in main ret = args.func(args) File "/home/akiernan/poky/scripts/lib/recipetool/edit.py", line 38, in edit return scriptutils.run_editor([recipe_path] + appends, logger) TypeError: can only concatenate list (not "tuple") to list (From OE-Core rev: 4c1e74bdf4922519d168434afd69c9bebcb9bd82) Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie

recipetool/create: npm: remove the 'noverify' url parameter

2020-01-27T16:48:09+00:00

This commit removes the 'noverify' parameter which was added to the url to fix warnings with the shrinkwrap / lockdown file generation. This is not needed anymore with the new npm fetcher. (From OE-Core rev: 401a9818c633373854d3c7dec032b9f455f2b2b4) Signed-off-by: Jean-Marie LEMETAYER Signed-off-by: Richard Purdie