From a79707b94dc35581152ac1457ec20752db694968 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 9 Apr 2024 15:09:48 +0800 Subject: babeltrace2: upgrade 2.0.5 -> 2.0.6 Changelog: =========== * bt2: disable some warnings for 'native_bt.c' * bt2: compile 'native_bt.c' with '-Wno-undef' * Fix: src.ctf.lttng-live: expect NEW_STREAM/METADATA for inactive streams * Fix: 'babeltrace2 convert': don't consider the '--plugin-path' opt. * include/babeltrace2/plugin/plugin-dev.h: "define" -> "definition * Fix: doc: escape double quote in bt_p alias * Fix: bt2: pass _TraceClassConst to destruction listeners * fix: 'load_module()' deprecated in Python 3.12 * tests: retry os.rename on PermissionError failure in lttng_live_server.py * doc: fix uptream -> upstream typos * fix: test_message_iterator.py hangs on Python 3.12 * plugin-dev: mark symbols meant to be public with __attribute__((visibility("default"))) * Silence -Wunused-but-set-variable error with clang * Fix: Windows DLL path lookup with Python >= 3.8 * doc/man: make default values of boolean init. params. clearer * RFC: docs: fix: Match stated automake requirement * fix: make flake8 6.x happy * fix: running black on python 3.11 * bt_query_executor_create_with_method_data(): fix docs note * Fix: ctf-writer: null dereference in bt_ctf_trace_common_add_stream_class * Update working version to Babeltrace v2.0.6 (From OE-Core rev: a5f05da60ca888456900f9fb0a52ef07db754c06) Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- meta/recipes-kernel/lttng/babeltrace2_2.0.5.bb | 95 -------------------------- meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb | 95 ++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 95 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/babeltrace2_2.0.5.bb create mode 100644 meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb (limited to 'meta/recipes-kernel') diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.5.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.5.bb deleted file mode 100644 index 9a4007fb25..0000000000 --- a/meta/recipes-kernel/lttng/babeltrace2_2.0.5.bb +++ /dev/null @@ -1,95 +0,0 @@ -SUMMARY = "Babeltrace2 - Trace Format Babel Tower" -DESCRIPTION = "Babeltrace provides trace read and write libraries in host side, as well as a trace converter, which used to convert LTTng 2.0 traces into human-readable log." -HOMEPAGE = "http://babeltrace.org/" -BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace" -LICENSE = "MIT & GPL-2.0-only & LGPL-2.1-only & BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a458c13f18385b7bc5069a6d7b176e" - -DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" - -SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.0;protocol=https \ - file://run-ptest \ - file://0001-tests-do-not-run-test-applications-from-.libs.patch \ - file://0001-Make-manpages-multilib-identical.patch \ - " -SRCREV = "66e76d1ea601705928899138f02730a3a2a3153d" -UPSTREAM_CHECK_GITTAGREGEX = "v(?P2(\.\d+)+)$" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig ptest python3targetconfig - -EXTRA_OECONF = "--disable-debug-info --disable-Werror" - -PACKAGECONFIG ??= "manpages" -PACKAGECONFIG[manpages] = ", --disable-man-pages, asciidoc-native xmlto-native" - -FILES:${PN}-staticdev += "${libdir}/babeltrace2/plugins/*.a" -FILES:${PN} += "${libdir}/babeltrace2/plugins/*.so" - -ASNEEDED = "" -LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld ptest', ' -fuse-ld=bfd ', '', d)}" - -# coreutils since we need full mktemp -RDEPENDS:${PN}-ptest += "bash gawk python3 make grep coreutils findutils" - -do_compile_ptest () { - make -C tests all -} - -do_install_ptest () { - install -d "${D}${PTEST_PATH}/tests" - - # Copy required files from source directory - for d in $(find "${S}/tests" -type d -printf '%P ') ; do - install -d "${D}${PTEST_PATH}/tests/$d" - find "${S}/tests/$d" -maxdepth 1 -executable -type f \ - -exec install -t "${D}${PTEST_PATH}/tests/$d" {} + - find "${S}/tests/$d" -maxdepth 1 -name *.sh \ - -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; - find "${S}/tests/$d" -maxdepth 1 -name *.py \ - -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; - find "${S}/tests/$d" -maxdepth 1 -name *.expect \ - -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; - done - install -d "${D}${PTEST_PATH}/tests/data/ctf-traces/" - cp -a ${S}/tests/data/ctf-traces/* ${D}${PTEST_PATH}/tests/data/ctf-traces/ - - # Copy the tests directory tree and the executables and - # Makefiles found within. - install -D "${B}/tests/Makefile" "${D}${PTEST_PATH}/tests/" - for d in $(find "${B}/tests" -type d -not -name .libs -printf '%P ') ; do - install -d "${D}${PTEST_PATH}/tests/$d" - find "${B}/tests/$d" -maxdepth 1 -executable -type f \ - -exec install -t "${D}${PTEST_PATH}/tests/$d" {} + - test -r "${B}/tests/$d/Makefile" && \ - install -t "${D}${PTEST_PATH}/tests/$d" "${B}/tests/$d/Makefile" - find "${B}/tests/$d" -maxdepth 1 -name *.sh \ - -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; - done - - for d in $(find "${B}/tests" -type d -name .libs -printf '%P ') ; do - for f in $(find "${B}/tests/$d" -maxdepth 1 -executable -type f -printf '%P ') ; do - cp ${B}/tests/$d/$f ${D}${PTEST_PATH}/tests/`dirname $d`/$f - done - done - - # Prevent attempts to update Makefiles during test runs, and - # silence "Making check in $SUBDIR" messages. - find "${D}${PTEST_PATH}" -name Makefile -type f -exec \ - sed -i \ - -e '/Makefile:/,/^$/d' \ - -e '/%: %.in/,/^$/d' \ - -e '/echo "Making $$target in $$subdir"; \\/d' \ - -e 's/^srcdir = \(.*\)/srcdir = ./' \ - -e 's/^builddir = \(.*\)/builddir = ./' \ - -e 's/^all-am:.*/all-am:/' \ - {} + - - # Substitute links to installed binaries. - install -d "${D}${PTEST_PATH}/src/cli/" - ln -s "${bindir}/babeltrace2" ${D}${PTEST_PATH}/src/cli/ - - # Remove architechture specific testfiles - rm -rf ${D}${PTEST_PATH}/tests/data/plugins/flt.lttng-utils.debug-info/* -} diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb new file mode 100644 index 0000000000..d6c75d7580 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.6.bb @@ -0,0 +1,95 @@ +SUMMARY = "Babeltrace2 - Trace Format Babel Tower" +DESCRIPTION = "Babeltrace provides trace read and write libraries in host side, as well as a trace converter, which used to convert LTTng 2.0 traces into human-readable log." +HOMEPAGE = "http://babeltrace.org/" +BUGTRACKER = "https://bugs.lttng.org/projects/babeltrace" +LICENSE = "MIT & GPL-2.0-only & LGPL-2.1-only & BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a458c13f18385b7bc5069a6d7b176e" + +DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" + +SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.0;protocol=https \ + file://run-ptest \ + file://0001-tests-do-not-run-test-applications-from-.libs.patch \ + file://0001-Make-manpages-multilib-identical.patch \ + " +SRCREV = "0a6632f77801f3218a288604c646f8a39cb0d2c4" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P2(\.\d+)+)$" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig ptest python3targetconfig + +EXTRA_OECONF = "--disable-debug-info --disable-Werror" + +PACKAGECONFIG ??= "manpages" +PACKAGECONFIG[manpages] = ", --disable-man-pages, asciidoc-native xmlto-native" + +FILES:${PN}-staticdev += "${libdir}/babeltrace2/plugins/*.a" +FILES:${PN} += "${libdir}/babeltrace2/plugins/*.so" + +ASNEEDED = "" +LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld ptest', ' -fuse-ld=bfd ', '', d)}" + +# coreutils since we need full mktemp +RDEPENDS:${PN}-ptest += "bash gawk python3 make grep coreutils findutils" + +do_compile_ptest () { + make -C tests all +} + +do_install_ptest () { + install -d "${D}${PTEST_PATH}/tests" + + # Copy required files from source directory + for d in $(find "${S}/tests" -type d -printf '%P ') ; do + install -d "${D}${PTEST_PATH}/tests/$d" + find "${S}/tests/$d" -maxdepth 1 -executable -type f \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} + + find "${S}/tests/$d" -maxdepth 1 -name *.sh \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; + find "${S}/tests/$d" -maxdepth 1 -name *.py \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; + find "${S}/tests/$d" -maxdepth 1 -name *.expect \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; + done + install -d "${D}${PTEST_PATH}/tests/data/ctf-traces/" + cp -a ${S}/tests/data/ctf-traces/* ${D}${PTEST_PATH}/tests/data/ctf-traces/ + + # Copy the tests directory tree and the executables and + # Makefiles found within. + install -D "${B}/tests/Makefile" "${D}${PTEST_PATH}/tests/" + for d in $(find "${B}/tests" -type d -not -name .libs -printf '%P ') ; do + install -d "${D}${PTEST_PATH}/tests/$d" + find "${B}/tests/$d" -maxdepth 1 -executable -type f \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} + + test -r "${B}/tests/$d/Makefile" && \ + install -t "${D}${PTEST_PATH}/tests/$d" "${B}/tests/$d/Makefile" + find "${B}/tests/$d" -maxdepth 1 -name *.sh \ + -exec install -t "${D}${PTEST_PATH}/tests/$d" {} \; + done + + for d in $(find "${B}/tests" -type d -name .libs -printf '%P ') ; do + for f in $(find "${B}/tests/$d" -maxdepth 1 -executable -type f -printf '%P ') ; do + cp ${B}/tests/$d/$f ${D}${PTEST_PATH}/tests/`dirname $d`/$f + done + done + + # Prevent attempts to update Makefiles during test runs, and + # silence "Making check in $SUBDIR" messages. + find "${D}${PTEST_PATH}" -name Makefile -type f -exec \ + sed -i \ + -e '/Makefile:/,/^$/d' \ + -e '/%: %.in/,/^$/d' \ + -e '/echo "Making $$target in $$subdir"; \\/d' \ + -e 's/^srcdir = \(.*\)/srcdir = ./' \ + -e 's/^builddir = \(.*\)/builddir = ./' \ + -e 's/^all-am:.*/all-am:/' \ + {} + + + # Substitute links to installed binaries. + install -d "${D}${PTEST_PATH}/src/cli/" + ln -s "${bindir}/babeltrace2" ${D}${PTEST_PATH}/src/cli/ + + # Remove architechture specific testfiles + rm -rf ${D}${PTEST_PATH}/tests/data/plugins/flt.lttng-utils.debug-info/* +} -- cgit v1.2.3-54-g00ecf