From 379d198a4e11eae2cf5c2adb334a5dd4b9e8958a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 28 May 2021 10:39:27 +0000 Subject: [PATCH] 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. Signed-off-by: Richard Purdie (cherry picked from commit 5799a807eed44d380e142913e50308589b9412ed) Signed-off-by: Anuj Mittal --- .../{lttng-tools_2.12.3.bb => lttng-tools_2.12.4.bb} | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) rename meta/recipes-kernel/lttng/{lttng-tools_2.12.3.bb => lttng-tools_2.12.4.bb} (94%) diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.12.3.bb b/meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb similarity index 94% rename from meta/recipes-kernel/lttng/lttng-tools_2.12.3.bb rename to 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 DEPENDS = "liburcu popt libxml2 util-linux" RDEPENDS_${PN} = "libgcc" RRECOMMENDS_${PN} += "${LTTNGMODULES}" -RDEPENDS_${PN}-ptest += "make perl bash gawk babeltrace procps perl-module-overloading coreutils util-linux kmod ${LTTNGMODULES} sed python3-core" +RDEPENDS_${PN}-ptest += "make perl bash gawk babeltrace procps perl-module-overloading coreutils util-linux kmod ${LTTNGMODULES} sed python3-core grep" RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils" RDEPENDS_${PN}-ptest_append_libc-musl = " musl-utils" # babelstats.pl wants getopt-long @@ -39,7 +39,7 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ file://determinism.patch \ " -SRC_URI[sha256sum] = "2890da230edd523fcf497e9eb28133b7606d64fa01bcbffadbfcba42104db153" +SRC_URI[sha256sum] = "d729f8c2373a41194f171aeb0da0a9bb35ac181f31afa7e260786d19a500dea1" inherit autotools ptest pkgconfig useradd python3-dir manpages systemd @@ -69,7 +69,10 @@ do_install_append () { } do_install_ptest () { - 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 + 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 \ + tests/regression/tools/base-path/*.lttng; do install -D "${B}/$f" "${D}${PTEST_PATH}/$f" done -- 2.40.1