From e9b318408bd6e68e4d7f7d4f74abf6d55f2dae09 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 13 Mar 2025 18:05:03 +0100 Subject: [PATCH] glib-2.0: address ptest failures Particularly: - one of the tests requires a C.utf-8 locale (only available in glibc) - another needs .gir files to be installed Also, consolidate the ptest dependencies in a single variable assignment. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-core/glib-2.0/glib.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index c6e2d6e1a0..ee23c5089d 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -157,8 +157,6 @@ CODEGEN_PYTHON_RDEPENDS:mingw32 = "" RDEPENDS:${PN}-codegen += "${CODEGEN_PYTHON_RDEPENDS}" -RDEPENDS:${PN}-ptest += "${PN}-utils" - RDEPENDS:${PN}-ptest += "\ coreutils \ libgcc \ @@ -171,6 +169,7 @@ RDEPENDS:${PN}-ptest += "\ tzdata-europe \ tzdata-posix \ shared-mime-info \ + ${PN}-dev \ ${PN}-locale-ja \ ${PN}-locale-fr \ ${PN}-locale-el \ @@ -179,6 +178,7 @@ RDEPENDS:${PN}-ptest += "\ ${PN}-locale-pl \ ${PN}-locale-ru \ ${PN}-locale-th \ + ${PN}-utils \ python3-core \ python3-modules \ ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'python3-dbusmock', '', d)} \ @@ -190,6 +190,7 @@ RDEPENDS:${PN}-ptest += "\ locale-base-fr-fr \ locale-base-ru-ru \ " +INSANE_SKIP:${PN}-ptest = "dev-deps" RDEPENDS:${PN}-ptest:append:libc-glibc = "\ glibc-gconv-utf-16 \ @@ -203,6 +204,7 @@ RDEPENDS:${PN}-ptest:append:libc-glibc = "\ glibc-gconv-iso8859-15 \ glibc-charmap-invariant \ glibc-localedata-translit-cjk-variants \ + locale-base-c \ locale-base-lt-lt \ locale-base-ja-jp.euc-jp \ locale-base-fa-ir \ -- 2.47.3