summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorMingde (Matthew) Zeng <matthew.zeng@windriver.com>2020-02-18 14:46:49 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-19 11:24:15 +0000
commitd2a47421f6e03f51ff140c4eabca36468d9e5635 (patch)
treec4d485bf5c564ca895324bbdd9281ff860793772 /meta/recipes-core
parentbe53b56b0cc2e1e8ab626de2c7b226f82a20c6c6 (diff)
downloadpoky-d2a47421f6e03f51ff140c4eabca36468d9e5635.tar.gz
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. (From OE-Core rev: b649cf5c09a45df2df9a8f8f0920c6dfb07b8d76) Signed-off-by: Matthew Zeng <matthew.zeng@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/run-ptest3
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc12
2 files changed, 11 insertions, 4 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
index fc50082c8e..7a231b514b 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
+++ b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
@@ -1,6 +1,9 @@
1#! /bin/sh 1#! /bin/sh
2 2
3set -eux 3set -eux
4if id -u glib2-test; then
5 userdel glib2-test
6fi
4useradd glib2-test 7useradd glib2-test
5su glib2-test -c 'gnome-desktop-testing-runner glib' 8su glib2-test -c 'gnome-desktop-testing-runner glib'
6userdel glib2-test 9userdel glib2-test
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index f4aff297e5..23c347dbf7 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -58,13 +58,15 @@ FILES_${PN} = "${libdir}/lib*${SOLIBS} \
58 ${libdir}/gio \ 58 ${libdir}/gio \
59 ${libexecdir}/*gio-querymodules \ 59 ${libexecdir}/*gio-querymodules \
60 ${datadir}/glib-2.0/schemas" 60 ${datadir}/glib-2.0/schemas"
61
62FILES_${PN}-utils += "${bindir}/glib-genmarshal \
63 ${bindir}/glib-gettextize \
64 ${bindir}/glib-mkenums \
65 ${bindir}/glib-compile-resources"
66
61FILES_${PN}-dev += "${libdir}/glib-2.0/include \ 67FILES_${PN}-dev += "${libdir}/glib-2.0/include \
62 ${libdir}/gio/modules/lib*${SOLIBSDEV} \ 68 ${libdir}/gio/modules/lib*${SOLIBSDEV} \
63 ${libdir}/gio/modules/*.la \ 69 ${libdir}/gio/modules/*.la \
64 ${bindir}/glib-genmarshal \
65 ${bindir}/glib-gettextize \
66 ${bindir}/glib-mkenums \
67 ${bindir}/glib-compile-resources \
68 ${datadir}/glib-2.0/gettext/po/Makefile.in.in \ 70 ${datadir}/glib-2.0/gettext/po/Makefile.in.in \
69 ${datadir}/glib-2.0/schemas/gschema.dtd \ 71 ${datadir}/glib-2.0/schemas/gschema.dtd \
70 ${datadir}/glib-2.0/valgrind/glib.supp \ 72 ${datadir}/glib-2.0/valgrind/glib.supp \
@@ -138,6 +140,8 @@ CODEGEN_PYTHON_RDEPENDS_mingw32 = ""
138 140
139RDEPENDS_${PN}-codegen += "${CODEGEN_PYTHON_RDEPENDS}" 141RDEPENDS_${PN}-codegen += "${CODEGEN_PYTHON_RDEPENDS}"
140 142
143RDEPENDS_${PN}-ptest += "${PN}-utils"
144
141RDEPENDS_${PN}-ptest += "\ 145RDEPENDS_${PN}-ptest += "\
142 coreutils \ 146 coreutils \
143 libgcc \ 147 libgcc \