summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-28 10:39:27 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-06-26 15:24:08 +0100
commit6381058f4ce1479125181e6c88020e1f1ff6fe62 (patch)
tree3e32d87b03e63029ca0d1d98bf916c2cfb4828c7 /meta
parentaab8355df201160ad087bfb32c6b81b3948e6616 (diff)
downloadpoky-6381058f4ce1479125181e6c88020e1f1ff6fe62.tar.gz
lttng-tools: upgrade 2.12.3 -> 2.12.4
Add a new lttng file to one of the tests to avoid test failures. Also add a dependency on grep since standalone testing revealed test failures without this. Normally this was added by other dependencies in the ptest images so we didn't see this. (From OE-Core rev: 379d198a4e11eae2cf5c2adb334a5dd4b9e8958a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 5799a807eed44d380e142913e50308589b9412ed) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb (renamed from meta/recipes-kernel/lttng/lttng-tools_2.12.3.bb)9
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.12.3.bb b/meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb
index 6132daf1a1..133d7561b8 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.12.3.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb
@@ -15,7 +15,7 @@ include lttng-platforms.inc
15DEPENDS = "liburcu popt libxml2 util-linux" 15DEPENDS = "liburcu popt libxml2 util-linux"
16RDEPENDS_${PN} = "libgcc" 16RDEPENDS_${PN} = "libgcc"
17RRECOMMENDS_${PN} += "${LTTNGMODULES}" 17RRECOMMENDS_${PN} += "${LTTNGMODULES}"
18RDEPENDS_${PN}-ptest += "make perl bash gawk babeltrace procps perl-module-overloading coreutils util-linux kmod ${LTTNGMODULES} sed python3-core" 18RDEPENDS_${PN}-ptest += "make perl bash gawk babeltrace procps perl-module-overloading coreutils util-linux kmod ${LTTNGMODULES} sed python3-core grep"
19RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils" 19RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils"
20RDEPENDS_${PN}-ptest_append_libc-musl = " musl-utils" 20RDEPENDS_${PN}-ptest_append_libc-musl = " musl-utils"
21# babelstats.pl wants getopt-long 21# babelstats.pl wants getopt-long
@@ -39,7 +39,7 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
39 file://determinism.patch \ 39 file://determinism.patch \
40 " 40 "
41 41
42SRC_URI[sha256sum] = "2890da230edd523fcf497e9eb28133b7606d64fa01bcbffadbfcba42104db153" 42SRC_URI[sha256sum] = "d729f8c2373a41194f171aeb0da0a9bb35ac181f31afa7e260786d19a500dea1"
43 43
44inherit autotools ptest pkgconfig useradd python3-dir manpages systemd 44inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
45 45
@@ -69,7 +69,10 @@ do_install_append () {
69} 69}
70 70
71do_install_ptest () { 71do_install_ptest () {
72 for f in Makefile tests/Makefile tests/utils/utils.sh tests/regression/tools/save-load/*.lttng tests/regression/tools/save-load/configuration/load-42*.lttng tests/regression/tools/health/test_health.sh tests/regression/tools/metadata/utils.sh tests/regression/tools/rotation/rotate_utils.sh; do 72 for f in Makefile tests/Makefile tests/utils/utils.sh tests/regression/tools/save-load/*.lttng \
73 tests/regression/tools/save-load/configuration/load-42*.lttng tests/regression/tools/health/test_health.sh \
74 tests/regression/tools/metadata/utils.sh tests/regression/tools/rotation/rotate_utils.sh \
75 tests/regression/tools/base-path/*.lttng; do
73 install -D "${B}/$f" "${D}${PTEST_PATH}/$f" 76 install -D "${B}/$f" "${D}${PTEST_PATH}/$f"
74 done 77 done
75 78