diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools_git.bb')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools_git.bb | 108 |
1 files changed, 71 insertions, 37 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools_git.bb b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools_git.bb index 8bd09892c..bfc657b3a 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools_git.bb +++ b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools_git.bb @@ -9,40 +9,41 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \ file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca" -DEPENDS = "liburcu popt libxml2" +DEPENDS = "liburcu popt libxml2 util-linux" RDEPENDS_${PN} = "libgcc" -RDEPENDS_${PN}-ptest += "make perl bash" +RDEPENDS_${PN}-ptest += "make perl bash gawk ${PN} babeltrace procps" +# babelstats.pl wants getopt-long +RDEPENDS_${PN}-ptest += "perl-module-getopt-long" -SRCREV = "a90f2c1e10b759782653a81815625e9d1bbb75ca" -PV = "2.7.1+git${SRCPV}" +SRCREV = "d11e0dba0df9024b8613c51e167a379b91e8b20b" +PV = "2.8.1+git${SRCPV}" -PYTHON_OPTION = "am_cv_python_pyexecdir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \ - am_cv_python_pythondir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \ - PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}' \ +PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \ + am_cv_python_pythondir='${PYTHON_SITEPACKAGES_DIR}' \ + PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}${PYTHON_ABI}' \ " PACKAGECONFIG ??= "lttng-ust" -PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python swig-native" -PACKAGECONFIG[lttng-ust] = "--enable-lttng-ust, --disable-lttng-ust, lttng-ust" +PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python3 swig-native" +PACKAGECONFIG[lttng-ust] = "--with-lttng-ust, --without-lttng-ust, lttng-ust" PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod" +PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native" PACKAGECONFIG_remove_libc-musl = "lttng-ust" -SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.7 \ - file://Revert-Build-look-for-python-3.0-when-building-pytho.patch \ - file://stop-using-SIGUNUSED.patch \ - file://runtest-2.4.0.patch \ +SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.8 \ + file://0001-Fix-error.h-common-error.h.patch \ file://run-ptest" S = "${WORKDIR}/git" -inherit autotools-brokensep ptest pkgconfig useradd +inherit autotools-brokensep ptest pkgconfig useradd python3-dir USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "tracing" FILES_${PN} += "${libdir}/lttng/libexec/* ${datadir}/xml/lttng \ - ${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" -FILES_${PN}-staticdev += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a" -FILES_${PN}-dev += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la" + ${PYTHON_SITEPACKAGES_DIR}/*" +FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" +FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la" # Since files are installed into ${libdir}/lttng/libexec we match # the libexec insane test so skip it. @@ -52,31 +53,64 @@ INSANE_SKIP_${PN}-dbg = "libexec" do_configure_prepend () { # Delete a shipped m4 file that overrides our patched one - rm -f ${S}/config/libxml.m4 + rm -f ${S}/m4/libxml.m4 } do_install_ptest () { - chmod +x ${D}${PTEST_PATH}/tests/utils/utils.sh - for i in `find ${D}${PTEST_PATH} -perm /u+x -type f`; do - sed -e "s:\$TESTDIR.*/src/bin/lttng/\$LTTNG_BIN:\$LTTNG_BIN:g" \ - -e "s:\$TESTDIR/../src/bin/lttng-sessiond/\$SESSIOND_BIN:\$SESSIOND_BIN:g" \ - -e "s:\$DIR/../src/bin/lttng-sessiond/\$SESSIOND_BIN:\$SESSIOND_BIN:g" \ - -e "s:\$TESTDIR/../src/bin/lttng-consumerd/:${libdir}/lttng/libexec/:g" \ - -e "s:\$DIR/../src/bin/lttng-consumerd/:${libdir}/lttng/libexec/:g" \ - -e "s:\$TESTDIR/../src/bin/lttng-relayd/\$RELAYD_BIN:\$RELAYD_BIN:g" \ - -e "s:\$DIR/../src/bin/lttng-sessiond/lttng-sessiond:\$SESSIOND_BIN:g" \ - -e "s:\$DIR/../src/bin/lttng-relayd/\$RELAYD_BIN:\$RELAYD_BIN:g" \ - -e "s:\$DIR/../bin/lttng-relayd/\$RELAYD_BIN:\$RELAYD_BIN:g" \ - -i $i + mkdir -p ${D}${PTEST_PATH} + + cp -a -T ${B} ${D}${PTEST_PATH} + + # 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 's!^Makefile:!_Makefile:!' \ + -e '/echo "Making $$target in $$subdir"; \\/d' {} + + + # Prevent attempts to update version.h during test runs. + sed -i -e '/^\.PHONY: version\.h$/d' ${D}${PTEST_PATH}/include/Makefile + + # Silence "Making check in $SUBDIR" messages. + find ${D}${PTEST_PATH} -name Makefile -type f -exec \ + sed -i -e '/echo "Making $$target in $$subdir"; \\/d' {} + + + # Substitute links to installed binaries. + for prog in lttng lttng-relayd lttng-sessiond lttng-consumerd ; do + orig="${D}${PTEST_PATH}/src/bin/${prog}/${prog}" + rm "$orig" + case "$prog" in + lttng-consumerd) + ln -s "${libdir}/lttng/libexec/$prog" "$orig" + ;; + *) + ln -s "${bindir}/$prog" "$orig" + ;; + esac done - # Update libdir references in copied .la files - for i in `find ${D}${PTEST_PATH} -type f -name *.la`; do - sed -i -e 's#${S}/tests/#${STAGING_DIR}${PTEST_PATH}#g' $i + # Remove libtool artifacts. + find ${D}${PTEST_PATH} \( -name '*.l[ao]' -o -name '*.lai' \) -delete + + # Remove object files and archives. + find ${D}${PTEST_PATH} -name '*.[oa]' -type f -delete + + # Remove Makefile.am and Makefile.in. + find ${D}${PTEST_PATH} -name 'Makefile.*' -type f -delete + + # Remove autom4te.cache. + rm -rf ${D}${PTEST_PATH}/autom4te.cache + + # Replace libtool wrapper scripts (which won't work on the + # target) with their corresponding binaries. + for prog in unit/ini_config/ini_config \ + regression/tools/live/live_test \ + regression/tools/health/health_check ; do + basename=${prog##*/} + ldir=${D}${PTEST_PATH}/tests/${prog%/*} + mv -f ${ldir}/.libs/${basename} ${ldir} done - sed -e "s:src/bin:bin:g" -e "s:lt-::g" \ - -i ${D}${PTEST_PATH}/tests/utils/utils.sh - sed -e "s:ini_config:\.libs\/ini_config:" \ - -i ${D}${PTEST_PATH}/tests/unit/ini_config/test_ini_config + # checkpatch.pl is unneeded on target and causes file-rdeps QA + # warnings. + rm -f ${D}${PTEST_PATH}/extras/checkpatch.pl } |