From: Richard Purdie Date: Tue, 19 Aug 2025 13:12:42 +0000 (+0100) Subject: babeltrace: Remove in favour of babeltrace2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d16a5e05b3f383d21a1970c6613494416a7503c2;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git babeltrace: Remove in favour of babeltrace2 This version is deprecated and replaced by babeltrace2. Drop the older version so we can focus efforts around the newer one. Signed-off-by: Richard Purdie --- diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index 20882523c28..07660a02bf8 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc @@ -15,7 +15,6 @@ DISTRO_PN_ALIAS:pn-alsa-utils-scripts = "OE-Core" DISTRO_PN_ALIAS:pn-atk = "Fedora=atk OpenSuSE=atk" DISTRO_PN_ALIAS:pn-avahi-libnss-mdns = "Meego=nss-mdns OpenSuSE=nss-mdns Ubuntu=nss-mdns Mandriva=nss_mdns Debian=nss-mdns" DISTRO_PN_ALIAS:pn-avahi-ui = "Ubuntu=avahi-discover Debian=avahi-discover" -DISTRO_PN_ALIAS:pn-babeltrace = "OSPDT" DISTRO_PN_ALIAS:pn-babeltrace2 = "OSPDT" DISTRO_PN_ALIAS:pn-bjam = "OpenSuSE=boost-jam Debian=bjam" DISTRO_PN_ALIAS:pn-bluez5 = "Fedora=bluez Opensuse=bluez" diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 0312ae00f67..a875ce8176a 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -53,7 +53,6 @@ RECIPE_MAINTAINER:pn-autoconf-archive = "Robert Yang RECIPE_MAINTAINER:pn-automake = "Robert Yang " RECIPE_MAINTAINER:pn-avahi = "Yi Zhao " RECIPE_MAINTAINER:pn-avahi-libnss-mdns = "Unassigned " -RECIPE_MAINTAINER:pn-babeltrace = "Unassigned " RECIPE_MAINTAINER:pn-babeltrace2 = "Unassigned " RECIPE_MAINTAINER:pn-barebox = "Enrico Jörns " RECIPE_MAINTAINER:pn-barebox-tools = "Enrico Jörns " diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index e3099439f4c..9a7b25a9165 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -7,7 +7,6 @@ PTESTS_FAST = "\ acl \ apr-util \ attr \ - babeltrace \ babeltrace2 \ bc \ bluez5 \ diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb index 54915e4f0c3..9c09f5ab443 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb @@ -35,7 +35,6 @@ LTTNGTOOLS = "lttng-tools" LTTNGTOOLS:arc = "" LTTNGTOOLS:riscv32 = "" -BABELTRACE = "babeltrace" BABELTRACE2 = "babeltrace2" # valgrind does not work on the following configurations/architectures @@ -59,7 +58,6 @@ VALGRIND:loongarch64 = "" RDEPENDS:${PN} = "\ ${PROFILETOOLS} \ ${LTTNGTOOLS} \ - ${BABELTRACE} \ ${BABELTRACE2} \ ${SYSTEMTAP} \ ${VALGRIND} \ diff --git a/meta/recipes-kernel/lttng/babeltrace/run-ptest b/meta/recipes-kernel/lttng/babeltrace/run-ptest deleted file mode 100755 index f4b7ce11e20..00000000000 --- a/meta/recipes-kernel/lttng/babeltrace/run-ptest +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# use target=recheck if you want to recheck failing tests -[ "$target" = "" ] && target=check - -# Without --ignore-exit, the tap harness causes any FAILs within a -# test plan to raise ERRORs; this is just noise. -makeargs="LOG_DRIVER_FLAGS=--ignore-exit top_srcdir=$PWD top_builddir=$PWD" - -exec make -C tests -k -s $makeargs $target 2>/dev/null diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.11.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.11.bb deleted file mode 100644 index 8ec80167a0d..00000000000 --- a/meta/recipes-kernel/lttng/babeltrace_1.5.11.bb +++ /dev/null @@ -1,98 +0,0 @@ -SUMMARY = "Babeltrace - 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" -LIC_FILES_CHKSUM = "file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa" - -DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" - -SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.5;protocol=https \ - file://run-ptest \ - " -SRCREV = "91c00f70884887ff5c4849a8e3d47e311a22ba9d" -UPSTREAM_CHECK_GITTAGREGEX = "v(?P1(\.\d+)+)$" - -inherit autotools pkgconfig ptest - -EXTRA_OECONF = "--disable-debug-info" - -ASNEEDED = "" - -RDEPENDS:${PN}-ptest += "bash gawk make" - -addtask do_patch_ptest_path after do_patch before do_configure -do_patch_ptest_path () { - for f in $(grep -l -r abs_top_srcdir ${S}/tests); do - sed -i 's:\@abs_top_srcdir\@:${PTEST_PATH}:' ${f} - done - - for f in $(grep -l -r abs_top_builddir ${S}/tests); do - sed -i 's:\@abs_top_builddir\@:${PTEST_PATH}:' ${f} - done - for f in $(grep -l -r GREP ${S}/tests); do - sed -i 's:\@GREP\@:grep:' ${f} - done - - for f in $(grep -l -r SED ${S}/tests); do - sed -i 's:\@SED\@:sed:' ${f} - done -} - -do_compile_ptest () { - make -C tests all -} - -do_install_ptest () { - # Copy required files from source directory - for f in config/tap-driver.sh config/test-driver; do - install -D "${S}/$f" "${D}${PTEST_PATH}/$f" - done - install -d "$f" "${D}${PTEST_PATH}/tests/ctf-traces/" - cp -a ${S}/tests/ctf-traces/* ${D}${PTEST_PATH}/tests/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 - - install -D ${B}/formats/ctf/metadata/.libs/ctf-parser-test \ - ${D}${PTEST_PATH}/formats/ctf/metadata/ctf-parser-test - - # 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 '/$(check_SCRIPTS)/s/^/#/' \ - -e '/%: %.in/,/^$/d' \ - -e '/echo "Making $$target in $$subdir"; \\/d' \ - -e 's/^srcdir = \(.*\)/srcdir = ./' \ - -e 's/^builddir = \(.*\)/builddir = ./' \ - -e 's/^all-am:.*/all-am:/' \ - {} + - - # Remove path to babeltrace. - for f in $(grep -l -r "^BABELTRACE_BIN" ${D}${PTEST_PATH}); do - sed -i 's:^BABELTRACE_BIN.*:BABELTRACE_BIN=/usr/bin/babeltrace:' ${f} - done - for f in $(grep -l -r "^BTBIN" ${D}${PTEST_PATH}); do - sed -i 's:^BTBIN.*:BTBIN=/usr/bin/babeltrace:' ${f} - done -} - -BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.14.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.14.0.bb index a3faf1e758c..b3383accd9a 100644 --- a/meta/recipes-kernel/lttng/lttng-tools_2.14.0.bb +++ b/meta/recipes-kernel/lttng/lttng-tools_2.14.0.bb @@ -15,7 +15,7 @@ include lttng-platforms.inc DEPENDS = "liburcu popt libxml2 util-linux bison-native babeltrace2" 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 grep binutils" +RDEPENDS:${PN}-ptest += "make perl bash gawk procps perl-module-overloading coreutils util-linux kmod ${LTTNGMODULES} sed python3-core grep binutils" RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-utils" RDEPENDS:${PN}-ptest:append:libc-musl = " musl-utils" # babelstats.pl wants getopt-long