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

wic: bootimg-efi: fix error handling

2024-08-01T13:08:09+00:00

If we check for empty variables, it does not make sense to print their content in case they are empty. Additionally, the error message in the 'kernel' check attempted to print the wrong variable ('target') which was not even defined, yet. Also, raising WicError doesn't require an extra newline. (From OE-Core rev: a1cbf4d5ea5f852144d0cc70be99d6338c618fcd) Signed-off-by: Enrico Jörns Signed-off-by: Richard Purdie (cherry picked from commit f31cf475d0235f42d73aeec07694f79b9937fd76) Signed-off-by: Steve Sakoman

wic: engine.py: use raw string for escape sequence

2024-07-17T12:36:13+00:00

Fixes: | poky/scripts/lib/wic/engine.py:362: SyntaxWarning: invalid escape sequence '\/' (From OE-Core rev: ab3ed4270af1c8d4a4dd15b8c6998182801d4bce) Signed-off-by: Enrico Jörns Signed-off-by: Richard Purdie (cherry picked from commit e33d7241f6c2897e930aff41e18b154891197ab9) Signed-off-by: Steve Sakoman

devtool: ide-sdk: correct help typo

2024-07-09T13:02:55+00:00

(From OE-Core rev: 149f79c877f476eabafc667629f89af335fcae34) Signed-off-by: Antonin Godard Signed-off-by: Richard Purdie (cherry picked from commit 50e043387a2f0f9a5c2f7a5f914c465c830d329b) Signed-off-by: Steve Sakoman

wic/partition.py: Set hash_seed for empty ext partition

2024-07-03T13:28:37+00:00

Although setting hash_seed is handled for the rootfs plugin case, but this is missed when deploying an empty ext partition. (From OE-Core rev: a4e7334a4b87f1bb1947f6b10f71ddb445c91d0c) Signed-off-by: Adithya Balakumar Signed-off-by: Richard Purdie (cherry picked from commit 0202fb594fb05098cb8d8b6088e63beb40b5906e) Signed-off-by: Steve Sakoman

devtool: sync: Fix Execution error

2024-06-19T15:34:58+00:00

When executing devtool sync on a recipe that was extract with devtool extract earlier the following error occured: Traceback (most recent call last): [...] bb.process.ExecutionError: Execution of 'git fetch file:///home/vin/projects/poky/build/tmp/work/all-poky-linux/netbase/6.4/devtooltmp-figt1jmr/workdir/netbase devtool:devtool' failed with exit code 128: fatal: refusing to fetch into branch 'refs/heads/devtool' checked out at '/home/vin/projects/poky/build/netbase-src' Fix this by adding --update-head-ok and --force to git fetch so it will override the current head even if it is checked out and has changes. Possible existing changes in the devtool branch can be retrieved by checking out the devtool.bak branch (From OE-Core rev: ee712c8b3c32fedd6af0521d2e34ea655f8cd5ca) Signed-off-by: Vincent Kriek Signed-off-by: Alexandre Belloni (cherry picked from commit 4c89b061003a0f4143c6d3838e39fc2643edc8d6) Signed-off-by: Steve Sakoman

devtool: modify: Catch git submodule error for go code

2024-06-19T15:34:58+00:00

One of the git submodule commands failed for source extracted for recipes using go.bbclass. The root cause is probably the path set up by go_do_unpack which makes S and gitroot not match. This patch does not fix the root problem, but at least it is no worse than before the git submodule support. The extracted source will still have two .git folders, one in S created by devtool and one in the go path which will contain the tru git history. [ YOCTO #15483 ] (From OE-Core rev: 1dc639353658496db5c5df802c0259e87fe2ca0f) Signed-off-by: Anton Almqvist Signed-off-by: Ola x Nilsson Signed-off-by: Richard Purdie (cherry picked from commit fe242408af40dd1f6e47d9b2b232bdc76756c80a) Signed-off-by: Peter Kjellerstedt Signed-off-by: Steve Sakoman

devtool: standard: update-recipe/finish: fix update localfile in another layer

2024-06-05T12:57:12+00:00

When trying to use devtool update-recipe/finish on another layer, with modified local file we have the following error: Traceback (most recent call last): File "<..>/poky/scripts/devtool", line 350, in ret = main() ^^^^^^ File "<..>/poky/scripts/devtool", line 337, in main ret = args.func(args, config, basepath, workspace) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "<..>/poky/scripts/lib/devtool/standard.py", line 1968, in update_recipe updated, _, _ = _update_recipe(args.recipename, workspace, rd, args.mode, args.append, args.wildcard_version, args.no_remove, args.initial_rev, dry_run_outdir=dry_run_outdir, no_overrides=args.no_overrides, force_patch_refresh=args.force_patch_refresh) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "<..>/poky/scripts/lib/devtool/standard.py", line 1930, in _update_recipe updated, appendf, removed = _update_recipe_patch(recipename, workspace, srctree, crd, appendlayerdir, wildcard_version, no_remove, no_report_remove, initial_rev, dry_run_outdir, force_patch_refresh) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "<..>/poky/scripts/lib/devtool/standard.py", line 1747, in _update_recipe_patch patchdir = param.get('patchdir', ".") ^^^^^^^^^ AttributeError: 'str' object has no attribute 'get' This was introduced when adding support for git submodules. No selftest case exists to catch this, so a selftest will be added in another commit. (From OE-Core rev: de7ca9f800e15e10271502da7e51e3ae08e0c85b) (From OE-Core rev: b4fb19df1746d04c9534feff58a9e534705d46df) Signed-off-by: Julien Stephan Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie Signed-off-by: Jeff Harris Signed-off-by: Steve Sakoman

recipetool: Handle several go-import tags in go resolver

2024-05-23T15:55:01+00:00

When dynamically resolving go modules, the HTML page may contain several go-import meta tags. We must handle all and pick the correct one based on the module name. An example for such a behaviour is gonum.org/v1/gonum: (From OE-Core rev: b198617a988d6eeef09b84e1009c0dc8fb55a9c5) Signed-off-by: Sven Schwermer Signed-off-by: Alexandre Belloni (cherry picked from commit 9c36a61e29359067165bddc7f2accdf2c4c8a761) Signed-off-by: Steve Sakoman

recipetool: Handle unclean response in go resolver

2024-05-23T15:55:01+00:00

It appears that some go modules repond with a 404 error when trying to resolve them dynamically. The response body may still contain the go-import meta tag. An example for such behaviour is gonum.org/v1/gonum. (From OE-Core rev: d61934122cdc9f2d68f99e5e3363c3f1808e7782) Signed-off-by: Sven Schwermer Signed-off-by: Alexandre Belloni (cherry picked from commit 8f2e14ab6562a9a68819a960c66a258ea9dbe246) Signed-off-by: Steve Sakoman

devtool: standard: throws appropriate error if source is in detached HEAD

2024-04-12T16:27:53+00:00

If source is in detached HEAD, we get the following error when using detvool finish command: [...] File "<...>/poky/scripts/lib/devtool/standard.py", line 1938, in _update_recipe bb.process.run('git checkout %s' % startbranch, cwd=srctree) File "<...>/poky/bitbake/lib/bb/process.py", line 189, in run raise ExecutionError(cmd, pipe.returncode, stdout, stderr) bb.process.ExecutionError: Execution of 'git checkout (HEAD detached at 9bbf87e)' failed with exit code 2: /bin/sh: -c: line 1: syntax error near unexpected token `(' /bin/sh: -c: line 1: `git checkout (HEAD detached at 9bbf87e)' Check this and throws an appropriate error in this case (From OE-Core rev: d9c686b5ff9f591ec6b928ed539084c02df4c8a5) Signed-off-by: Julien Stephan Signed-off-by: Richard Purdie