linux/poky.git/scripts/lib/recipetool, branch dunfell-23.0.26

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

recipetool: Set master branch only as fallback

2021-12-14T22:49:22+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: 2bc6deb34aee7542d7086c24b166083c562a6a01) Signed-off-by: Stefan Herbrechtsmeier Signed-off-by: Richard Purdie (cherry picked from commit 34ece8030e7a6a100b5e3e7b94e6c786c0e199a6) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

meta/scripts: Manual git url branch additions

2021-11-11T10:54:32+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: 38fc0807eea14dc12610da4ba73c082d5a4b0744) Signed-off-by: Richard Purdie (cherry picked from commit 5340c0d688036c1be6c938f05d8a8c1e3b49ec38) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

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

2020-07-22T21:46:37+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: f8a5db7a6072ddb1be96405fc8b44f595275206d) Signed-off-by: Tim Orling Signed-off-by: Richard Purdie (cherry picked from commit 0eae98a369d80340e48dc690d09a1364cde97973) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

recipetool: create: fix SRCBRANCH not being passed to params

2020-06-26T17:26:49+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: 50789b582908f78d9bb2b5a05418433ad8074825) Signed-off-by: Tuomas Salokanto Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 0424df825f1e509faf6cd44403c0736bb91b57c3) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

recipetool: Fix list concatenation when using edit

2020-06-26T17:26:48+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: 9a45c7fb2d4491d2d34500acef8ea6dcd4f5d9d4) Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie (cherry picked from commit 4c1e74bdf4922519d168434afd69c9bebcb9bd82) Signed-off-by: Steve Sakoman 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

recipetool/create_npm: handle the licenses of the dependencies

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

As usual the 'LICENSE' and the 'LIC_FILES_CHKSUM' values reflects all the license files discovered in the source tree (including the dependencies). For npm recipes the 'LIC_FILES_CHKSUM' value contains also the status of the 'package.json' file of every packages as it contains license informations. Finally each package has a separate 'LICENSE_${PN}-package-name' value which describes its license. (From OE-Core rev: 9a70d4996c84b277f423eda5aac4acbe344599f4) Signed-off-by: Jean-Marie LEMETAYER Signed-off-by: Richard Purdie

recipetool/create_npm: refactor the npm recipe creation handler

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

This commit refactors the npm recipe creation handler to use the new npm behavior. The process is kept as simple as possible and only generates the shrinkwrap file. To avoid naming issues the recipe name is now extracted from the npm package name and not directly mapped. (From OE-Core rev: 1deccb0f0c204cd02fb8606f180d8a13df9f31db) Signed-off-by: Jean-Marie LEMETAYER Signed-off-by: Richard Purdie

devtool: npm: rename npm command line options

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

This commit renames the '--fetch-dev' option into '--npm-dev' as it is a npm only option. (From OE-Core rev: 2b75cc848ceebee4067788a621299bfd5fb62231) Signed-off-by: Jean-Marie LEMETAYER Signed-off-by: Richard Purdie