diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-28 10:39:27 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-06-08 12:25:20 +0100 |
commit | 7f3c996d300ce37b44a9048c5f3d6152a4c77b49 (patch) | |
tree | 04465965e0d9d440a32d122fc4c4fb20b29406ac | |
parent | 5d8d24d5b72628f331e930b32c649c232548b2f7 (diff) | |
download | poky-7f3c996d300ce37b44a9048c5f3d6152a4c77b49.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: 5799a807eed44d380e142913e50308589b9412ed)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 | |||
15 | DEPENDS = "liburcu popt libxml2 util-linux" | 15 | DEPENDS = "liburcu popt libxml2 util-linux" |
16 | RDEPENDS_${PN} = "libgcc" | 16 | RDEPENDS_${PN} = "libgcc" |
17 | RRECOMMENDS_${PN} += "${LTTNGMODULES}" | 17 | RRECOMMENDS_${PN} += "${LTTNGMODULES}" |
18 | RDEPENDS_${PN}-ptest += "make perl bash gawk babeltrace procps perl-module-overloading coreutils util-linux kmod ${LTTNGMODULES} sed python3-core" | 18 | RDEPENDS_${PN}-ptest += "make perl bash gawk babeltrace procps perl-module-overloading coreutils util-linux kmod ${LTTNGMODULES} sed python3-core grep" |
19 | RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils" | 19 | RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils" |
20 | RDEPENDS_${PN}-ptest_append_libc-musl = " musl-utils" | 20 | RDEPENDS_${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 | ||
42 | SRC_URI[sha256sum] = "2890da230edd523fcf497e9eb28133b7606d64fa01bcbffadbfcba42104db153" | 42 | SRC_URI[sha256sum] = "d729f8c2373a41194f171aeb0da0a9bb35ac181f31afa7e260786d19a500dea1" |
43 | 43 | ||
44 | inherit autotools ptest pkgconfig useradd python3-dir manpages systemd | 44 | inherit autotools ptest pkgconfig useradd python3-dir manpages systemd |
45 | 45 | ||
@@ -69,7 +69,10 @@ do_install_append () { | |||
69 | } | 69 | } |
70 | 70 | ||
71 | do_install_ptest () { | 71 | do_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 | ||