From 3ffa64167f6fe165518efdd4fc1c33bd062394be Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 30 Dec 2014 14:25:50 -0200 Subject: lttng-tools: Update to 2.5.3 version Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb | 77 -------------------------- meta/recipes-kernel/lttng/lttng-tools_2.5.3.bb | 76 +++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 77 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb create mode 100644 meta/recipes-kernel/lttng/lttng-tools_2.5.3.bb diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb deleted file mode 100644 index fd44aa5f6d..0000000000 --- a/meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb +++ /dev/null @@ -1,77 +0,0 @@ -SECTION = "devel" -SUMMARY = "Linux Trace Toolkit Control" -DESCRIPTION = "The Linux trace toolkit is a suite of tools designed \ -to extract program execution details from the Linux operating system \ -and interpret them." - -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \ - file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca" - -DEPENDS = "liburcu popt lttng-ust libxml2" -RDEPENDS_${PN}-ptest += "make perl bash" - -SRCREV = "8b27cacb277c2cdab791139b08da8eb87ab14a88" -PV = "v2.5.0" - -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}' \ -" -PACKAGECONFIG ??= "lttng-ust" -PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python swig-native" -PACKAGECONFIG[lttng-ust] = ", --disable-lttng-ust, lttng-ust" - -SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.5 \ - file://runtest-2.4.0.patch \ - file://run-ptest \ - " - -S = "${WORKDIR}/git" - -inherit autotools-brokensep ptest pkgconfig - -export KERNELDIR="${STAGING_KERNEL_DIR}" - -FILES_${PN} += "${libdir}/lttng/libexec/* ${datadir}/xml/lttng \ - ${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" -FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug \ - ${libdir}/python2.7/site-packages/.debug" -FILES_${PN}-staticdev += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a" -FILES_${PN}-dev += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la" - -# Since files are installed into ${libdir}/lttng/libexec we match -# the libexec insane test so skip it. -# Python module needs to keep _lttng.so -INSANE_SKIP_${PN} = "libexec dev-so" -INSANE_SKIP_${PN}-dbg = "libexec" - -do_configure_prepend () { - # Delete a shipped m4 file that overrides our patched one - rm -f ${S}/config/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 - done - - sed -e "s:src/bin/lttng-sessiond:$bindir:g" \ - -e "s:src/bin/lttng-consumerd:${libexecdir}/libexec/:g" \ - -i ${D}${PTEST_PATH}/tests/regression/run-report.py - 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 -} diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.5.3.bb b/meta/recipes-kernel/lttng/lttng-tools_2.5.3.bb new file mode 100644 index 0000000000..87052ebb8e --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-tools_2.5.3.bb @@ -0,0 +1,76 @@ +SECTION = "devel" +SUMMARY = "Linux Trace Toolkit Control" +DESCRIPTION = "The Linux trace toolkit is a suite of tools designed \ +to extract program execution details from the Linux operating system \ +and interpret them." + +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \ + file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca" + +DEPENDS = "liburcu popt lttng-ust libxml2" +RDEPENDS_${PN}-ptest += "make perl bash" + +SRCREV = "75d966798cf8cbe8ca12773c2bf2822983bd78a3" + +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}' \ +" +PACKAGECONFIG ??= "lttng-ust" +PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python swig-native" +PACKAGECONFIG[lttng-ust] = ", --disable-lttng-ust, lttng-ust" + +SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.5 \ + file://runtest-2.4.0.patch \ + file://run-ptest \ + " + +S = "${WORKDIR}/git" + +inherit autotools-brokensep ptest pkgconfig + +export KERNELDIR="${STAGING_KERNEL_DIR}" + +FILES_${PN} += "${libdir}/lttng/libexec/* ${datadir}/xml/lttng \ + ${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" +FILES_${PN}-dbg += "${libdir}/lttng/libexec/.debug \ + ${libdir}/python2.7/site-packages/.debug" +FILES_${PN}-staticdev += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a" +FILES_${PN}-dev += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la" + +# Since files are installed into ${libdir}/lttng/libexec we match +# the libexec insane test so skip it. +# Python module needs to keep _lttng.so +INSANE_SKIP_${PN} = "libexec dev-so" +INSANE_SKIP_${PN}-dbg = "libexec" + +do_configure_prepend () { + # Delete a shipped m4 file that overrides our patched one + rm -f ${S}/config/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 + done + + sed -e "s:src/bin/lttng-sessiond:$bindir:g" \ + -e "s:src/bin/lttng-consumerd:${libexecdir}/libexec/:g" \ + -i ${D}${PTEST_PATH}/tests/regression/run-report.py + 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 +} -- cgit v1.2.3