glib-2.0: add dependencies to fix ptest failures
PATCH v2 1/1 glib-2.0: add dependencies to fix ptest failures
There are a number of ptest failures due to executables not found in the image. Since these executables are in FILES_${PN}-dev, depending all of -dev which is an overkill. We take them out of -dev and put in -utils, then depend on the latter instead.
When starting a glib ptest but decided to Ctrl-c interrupt midway, ./run-ptest cannot be restarted unless running userdel glib2-test manually. Therefore adding a check prior to ptest will ensure the ptest can be restarted.
Signed-off-by Matthew Zeng <[email protected]>
--- meta/recipes-core/glib-2.0/glib-2.0/run-ptest | 3 +++ meta/recipes-core/glib-2.0/glib.inc | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-)
meta/recipes-core/glib-2.0/glib-2.0/run-ptest +3 -0
@@ -1,6 +1,9 @@ #! /bin/sh set -eux +if id -u glib2-test; then + userdel glib2-test +fi useradd glib2-test su glib2-test -c 'gnome-desktop-testing-runner glib' userdel glib2-test
meta/recipes-core/glib-2.0/glib.inc +8 -4
@@ -58,13 +58,15 @@ FILES_${PN} = "${libdir}/lib*${SOLIBS} \ ${libdir}/gio \ ${libexecdir}/*gio-querymodules \ ${datadir}/glib-2.0/schemas" + +FILES_${PN}-utils += "${bindir}/glib-genmarshal \ + ${bindir}/glib-gettextize \ + ${bindir}/glib-mkenums \ + ${bindir}/glib-compile-resources" + FILES_${PN}-dev += "${libdir}/glib-2.0/include \ ${libdir}/gio/modules/lib*${SOLIBSDEV} \ ${libdir}/gio/modules/*.la \ - ${bindir}/glib-genmarshal \ - ${bindir}/glib-gettextize \ - ${bindir}/glib-mkenums \ - ${bindir}/glib-compile-resources \ ${datadir}/glib-2.0/gettext/po/Makefile.in.in \ ${datadir}/glib-2.0/schemas/gschema.dtd \ ${datadir}/glib-2.0/valgrind/glib.supp \
@@ -138,6 +140,8 @@ CODEGEN_PYTHON_RDEPENDS_mingw32 = "" RDEPENDS_${PN}-codegen += "${CODEGEN_PYTHON_RDEPENDS}" +RDEPENDS_${PN}-ptest += "${PN}-utils" + RDEPENDS_${PN}-ptest += "\ coreutils \ libgcc \
--
2.24.0