linux/poky.git, branch 3.2_M2

lib/oe/reproducible.py: Fix git HEAD check

2020-07-29T10:37:31+00:00

The check for a git HEAD still wasn't quite correct because it was using the .git directory as the current working directory. Instead, it should be passed as the --git-dir argument when running git. Running `git rev-parse HEAD` in a .git directory with no HEAD reports 'HEAD' and exits with success but then 'git log' will fail, which is not what we want. (From OE-Core rev: cdbd47dd7e1657b91b65a0940b7cbf119764240f) Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie

Revert "lib/oe/log_colorizer.py: add LogColorizerProxyProgressHandler"

2020-07-29T10:35:51+00:00

This reverts commit 312fb3c86a3d84e60867b132666c01859f73ceb2 as this wasn't meant to merge as yet. Signed-off-by: Richard Purdie

bitbake: build: create_progress_handler: fix calling 'get' on NoneType

2020-07-29T09:13:02+00:00

Just use the |resolve| function which already takes care of it. (Bitbake rev: 91b809a0902ffd42be4edf7f0a7d25e6d354d822) Signed-off-by: Chris Laplante Signed-off-by: Richard Purdie

bitbake: build: print traceback if progress handler can't be created

2020-07-29T09:13:02+00:00

Before: ERROR: expat-native-2.2.9-r0 do_compile: 'NoneType' object has no attribute 'get' ERROR: Logfile of failure stored in: /home/laplante/repos/oe-core/build/tmp-glibc/work/x86_64-linux/expat-native/2.2.9-r0/temp/log.do_compile.90289 Log data follows: | ERROR: 'NoneType' object has no attribute 'get' ERROR: Task (virtual:native:/home/laplante/repos/oe-core/meta/recipes-core/expat/expat_2.2.9.bb:do_compile) failed with exit code '1' After: ERROR: expat-native-2.2.9-r0 do_configure: Failed to create progress handler ERROR: expat-native-2.2.9-r0 do_configure: Traceback (most recent call last): File "/home/laplante/repos/oe-core/bitbake/lib/bb/build.py", line 400, in exec_func_shell logfile = create_progress_handler(func, progress, logfile, d) File "/home/laplante/repos/oe-core/bitbake/lib/bb/build.py", line 344, in create_progress_handler cls_obj = functools.reduce(resolve, cls.split("."), bb.utils._context) File "/home/laplante/repos/oe-core/bitbake/lib/bb/build.py", line 343, in resolve return x.get(y) AttributeError: 'NoneType' object has no attribute 'get' ERROR: expat-native-2.2.9-r0 do_configure: 'NoneType' object has no attribute 'get' ERROR: Logfile of failure stored in: /home/laplante/repos/oe-core/build/tmp-glibc/work/x86_64-linux/expat-native/2.2.9-r0/temp/log.do_configure.22982 ERROR: Task (virtual:native:/home/laplante/repos/oe-core/meta/recipes-core/expat/expat_2.2.9.bb:do_configure) failed with exit code '1' (Bitbake rev: ba0472a672eacbbbb2295252a0d2056d3399c6a9) Signed-off-by: Chris Laplante Signed-off-by: Richard Purdie

lib/oe/log_colorizer.py: add LogColorizerProxyProgressHandler

2020-07-29T09:12:31+00:00

This progress handler intercepts log output, stripping any ANSII color escape codes. Then the stripped output is fed to the underlying progress handler which will render the progress bar as usual. (From OE-Core rev: 312fb3c86a3d84e60867b132666c01859f73ceb2) Signed-off-by: Chris Laplante Signed-off-by: Richard Purdie

popt: upgrade to 1.18

2020-07-29T09:12:31+00:00

All our patches are upstreamed so drop them. (From OE-Core rev: aeb48eb989a42846fbaed6b7f3a5a3d951d11e23) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

cogl-1.0: correct X11 dependencies

2020-07-29T09:12:31+00:00

cogl depends on libxdamage when configured for X11 support. A dependency was added for this in 2012 with 959a2f6d88d8fa6874fff83b7a1f0e7d4e36b887, but that addition was lost when the recipe was reworked in 2013 with b508fdd2b19ca30da8d09caf646897dc4cf195c8. That commit also added a dependency on libxi, which is not actually needed. The missing dependency doesn't cause problems in most cases, since mesa also depends on libxdamage, but when an alternative opengl implementation such as libglvnd is used, cogl fails to configure. (From OE-Core rev: 7651a63c508562caf1a3732cb49af50bccc98e8b) Signed-off-by: Matt Madison Signed-off-by: Richard Purdie

gtk-icon-cache.bbclass: add features_check

2020-07-28T11:41:10+00:00

'bitbake world -k' when DISTRO_FEATURES don't have x11 and wayland, report errors: Nothing PROVIDES 'gtk+3' Nothing RPROVIDES 'blueman' gtk+3 set ANY_OF_DISTRO_FEATURES, so add it here too since we DEPENDS on it (From OE-Core rev: ab9ff563c77cd5105f4ef9426f076b10ea8e2ee8) Signed-off-by: Changqing Li Signed-off-by: Richard Purdie

wic/bootimg-efi: Update docs for IMAGE_BOOT_FILES support in bootimg-efi

2020-07-28T11:40:27+00:00

List of files defined using IMAGE_BOOT_FILES are installed into the boot partition when preparing an image using the wic tool with the bootimg-efi source plugin. The corresponding code in bootimg-efi.py is updated to add this feature, the documentation is updated to reflect the change. Change-Id: I0d3ea8831440f4255e9d9bcf9f965c8b14331037 (From yocto-docs rev: 41ef4c9cb9882369f02826b6c096014a4d90ee67) Signed-off-by: Khasim Syed Mohammed Signed-off-by: Richard Purdie

bitbake: server/process: Account for xmlrpc connections

2020-07-28T11:40:11+00:00

UI control can happen via the xmlrpc connection. Account for this when timing out UI connections. This was causing issues for toaster on systems where it couldn't parse the metadata within the timeout. (Bitbake rev: fa85a8263971c25e67fa3b421c686a90e46acd87) Signed-off-by: Richard Purdie