linux/poky.git/scripts/lib, branch dunfell-23.0.2

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

devtool: default to empty string, if LIC_FILES_CHKSUM is not available

2020-07-16T21:28:40+00:00

[Bug 13971] https://bugzilla.yoctoproject.org/show_bug.cgi?id=13971 A recipe using LICENSE=CLOSED would normally not have LIC_FILES_CHKSUM set. If LIC_FILES_CHKSUM was not set, it would cause `devtool upgrade` to fail. This fixes the issue by defaulting to an empty string if LIC_FILES_CHKSUM is not found. [YOCTO #13971] (From OE-Core rev: 9c7f3281884c50dbd05e2966e2409255c127ebfa) Signed-off-by: Bjarne Michelsen Signed-off-by: Richard Purdie (cherry picked from commit 95e112f0f465868e98285509ea0d1a624a439ac2) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

checklayer: parse LAYERDEPENDS with bb.utils.explode_dep_versions2()

2020-07-02T15:12:37+00:00

LAYERDEPENDS is a string of this format: "DEPEND1 (optional version) DEPEND2 (optional version) ..." However when we parse LAYERDEPENDS in _get_layer_collections() we parse it as a simple string, and if any optional versions are there the 'depends' field is wrong. For example, running yocto-check-layer might result in such errors: ERROR: Layer meta-python depends on (>= and isn't found. ERROR: Layer meta-python depends on 12) and isn't found. Let's use bb.utils.explode_dep_versions2() to parse LAYERDEPENDS, and create a string that contains all dependencies, effectively skipping/ignoring any optional versions. [YOCTO #13957] (From OE-Core rev: 819f41906197bb712af37349c0865002bfbd7c9b) Signed-off-by: Nicolas Dechesne Signed-off-by: Richard Purdie (cherry picked from commit f81f07afc200fe06c5c06ea81a4f8a3a43436faf) 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

resulttool/log: Add ability to dump ltp logs as well as ptest

2020-06-05T20:36:30+00:00

Currently only ptest logs are accessible with the log command, this adds support so the ltp logs can be extracted too. (From OE-Core rev: 0b513274a0ae722065cf1a605090000e854e2f81) Signed-off-by: Richard Purdie (cherry picked from commit 64a2121a875ce128959ee0a62e310d5f91f87b0d) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

resulttool/report: Remove leftover debugging

2020-06-05T20:36:30+00:00

I've long since wondered why there was some odd output in result reports, remove the leftover debug which was causing it. (From OE-Core rev: 10d1d2ffa0906561d65886caee44652242139913) Signed-off-by: Richard Purdie (cherry picked from commit 66e96bf70753933714ff8edcc13a1f35a052656f) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

checklayer: Skip layers without a collection

2020-06-05T20:36:30+00:00

As in other places in the file, skip layers that don't define a collection when searching for a layer to resolve a dependency. Fixes KeyError exceptions when attempting to access the layer collections later (From OE-Core rev: ae65adf471a9ad04c6a44bf020a28f1006db106a) Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie (cherry picked from commit 26090a2861ebe21224aaf89d7be0c0a89ca58e48) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie

Revert "wic: Fix permissions when using exclude or include path"

2020-04-07T20:57:16+00:00

This reverts commit 36993eea89d1c011397b7692b9b8d61b499d0171. After discussion on the mailing list it was felt these changes were not ready yet. Signed-off-by: Richard Purdie

Revert "wic: Add --embed-rootfs argument"

2020-04-07T20:57:16+00:00

This reverts commit efdcf94801f6abe8e4099e324d9a3deccd8d4384. After discussion on the mailing list it was felt these changes were not ready yet. Signed-off-by: Richard Purdie