From a8cb3220ec2f43932626e55944060f66c515f6fc Mon Sep 17 00:00:00 2001 From: Geoff Parker Date: Tue, 21 Feb 2023 21:21:29 +0100 Subject: [PATCH] python3-pillow: add tk to RDEPENDS ptest pkg only if x11 in DISTRO_FEATURES commit 7b0e71e00 ("python3-pillow: add ptest support", 2023-01-31) added tk to RDEPENDS:${PN}-ptest. Which cause this error on non x11 builds: ERROR: Nothing RPROVIDES 'tk' (but meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_9.4.0.bb RDEPENDS on or otherwise requires it) tk was skipped: missing required distro feature 'x11' (not in DISTRO_FEATURES) NOTE: Runtime target 'tk' is unbuildable, removing... Missing or unbuildable dependency chain was: ['tk'] NOTE: Runtime target 'iotmanager' is unbuildable, removing... Missing or unbuildable dependency chain was: ['iotmanager', 'python3-pillow', 'tk'] ERROR: Required build target 'update-runtime' has no buildable providers. Missing or unbuildable dependency chain was: ['update-runtime', 'runtime-image', 'iotmanager', 'python3-pillow', 'tk'] Add tk dependency only if DISTRO_FEATURES includes x11 (cherry picked from commit 6e8c90560e0aa8fe2ebfb791985cb75fd7490527) Signed-off-by: Geoff Parker Signed-off-by: Khem Raj Signed-off-by: Armin Kuster --- meta-python/recipes-devtools/python/python3-pillow_9.4.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python3-pillow_9.4.0.bb b/meta-python/recipes-devtools/python/python3-pillow_9.4.0.bb index 5a466778c0..86705d2d8e 100644 --- a/meta-python/recipes-devtools/python/python3-pillow_9.4.0.bb +++ b/meta-python/recipes-devtools/python/python3-pillow_9.4.0.bb @@ -45,7 +45,7 @@ RDEPENDS:${PN}-ptest += " \ ${PYTHON_PN}-pytest-timeout \ ${PYTHON_PN}-resource \ ${PYTHON_PN}-unixadmin\ - tk \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'tk', '', d)} \ " CVE_PRODUCT = "pillow"