* [PATCH 0/5] LTTng, Babeltrace updates
@ 2017-01-10 23:06 Nathan Lynch
2017-01-10 23:06 ` [PATCH 1/5] lttng-ust: don't exclude manual pages from build Nathan Lynch
` (4 more replies)
0 siblings, 5 replies; 12+ messages in thread
From: Nathan Lynch @ 2017-01-10 23:06 UTC (permalink / raw)
To: openembedded-core
Update LTTng components and Babeltrace to their latest available
tagged stable releases.
Nathan Lynch (5):
lttng-ust: don't exclude manual pages from build
lttng-ust: upgrade to 2.9.0
lttng-modules: upgrade to 2.9.0
lttng-tools: upgrade to 2.9.3
babeltrace: upgrade to 1.5.1
.../{babeltrace_1.5.0.bb => babeltrace_1.5.1.bb} | 5 +-
...lttng-modules_git.bb => lttng-modules_2.9.0.bb} | 10 +-
.../0001-Fix-error.h-common-error.h.patch | 33 -----
meta/recipes-kernel/lttng/lttng-tools/run-ptest | 5 +-
.../utils-remove-bogus-interpreter.patch | 35 +++++
.../{lttng-tools_git.bb => lttng-tools_2.9.3.bb} | 142 +++++++++++----------
.../lttng-ust/lttng-ust-doc-examples-disable.patch | 2 +-
.../lttng/{lttng-ust_git.bb => lttng-ust_2.9.0.bb} | 13 +-
8 files changed, 122 insertions(+), 123 deletions(-)
rename meta/recipes-kernel/lttng/{babeltrace_1.5.0.bb => babeltrace_1.5.1.bb} (81%)
rename meta/recipes-kernel/lttng/{lttng-modules_git.bb => lttng-modules_2.9.0.bb} (84%)
delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-common-error.h.patch
create mode 100644 meta/recipes-kernel/lttng/lttng-tools/utils-remove-bogus-interpreter.patch
rename meta/recipes-kernel/lttng/{lttng-tools_git.bb => lttng-tools_2.9.3.bb} (39%)
rename meta/recipes-kernel/lttng/{lttng-ust_git.bb => lttng-ust_2.9.0.bb} (84%)
--
2.7.4
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/5] lttng-ust: don't exclude manual pages from build
2017-01-10 23:06 [PATCH 0/5] LTTng, Babeltrace updates Nathan Lynch
@ 2017-01-10 23:06 ` Nathan Lynch
2017-01-10 23:06 ` [PATCH 2/5] lttng-ust: upgrade to 2.9.0 Nathan Lynch
` (3 subsequent siblings)
4 siblings, 0 replies; 12+ messages in thread
From: Nathan Lynch @ 2017-01-10 23:06 UTC (permalink / raw)
To: openembedded-core
Adding "manpages" to PACKAGECONFIG results in a lttng-ust-doc package
with no manpages. Fix the patch we carry to only exclude the examples
directory, which seems to have been its original intent anyway.
Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
---
.../recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch b/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch
index caf0b8bcf782..0f18c5d9f1b3 100644
--- a/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch
+++ b/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch
@@ -12,7 +12,7 @@ Index: doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = . man examples
-+SUBDIRS = .
++SUBDIRS = . man
dist_man_MANS = man/lttng-gen-tp.1 \
man/lttng-ust.3 \
--
2.7.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/5] lttng-ust: upgrade to 2.9.0
2017-01-10 23:06 [PATCH 0/5] LTTng, Babeltrace updates Nathan Lynch
2017-01-10 23:06 ` [PATCH 1/5] lttng-ust: don't exclude manual pages from build Nathan Lynch
@ 2017-01-10 23:06 ` Nathan Lynch
2017-01-10 23:06 ` [PATCH 3/5] lttng-modules: " Nathan Lynch
` (2 subsequent siblings)
4 siblings, 0 replies; 12+ messages in thread
From: Nathan Lynch @ 2017-01-10 23:06 UTC (permalink / raw)
To: openembedded-core
buildhistory-diff says:
/usr/lib/liblttng-ust-python-agent.so.0 was removed
/usr/lib/liblttng-ust-python-agent.so.0.0.0 was removed
This is because prior versions of lttng-ust unconditionally built
the Python agent libraries; this was fixed upstream in 21ddb8e ("Only
build python lib when agent is enabled").
Switch to using release tarballs.
Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
---
.../lttng/{lttng-ust_git.bb => lttng-ust_2.9.0.bb} | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
rename meta/recipes-kernel/lttng/{lttng-ust_git.bb => lttng-ust_2.9.0.bb} (84%)
diff --git a/meta/recipes-kernel/lttng/lttng-ust_git.bb b/meta/recipes-kernel/lttng/lttng-ust_2.9.0.bb
similarity index 84%
rename from meta/recipes-kernel/lttng/lttng-ust_git.bb
rename to meta/recipes-kernel/lttng/lttng-ust_2.9.0.bb
index 07ce2f4382bb..9cdefddf16bd 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_git.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_2.9.0.bb
@@ -18,13 +18,13 @@ RPROVIDES_${PN} = "lttng2-ust"
RREPLACES_${PN} = "lttng2-ust"
RCONFLICTS_${PN} = "lttng2-ust"
-SRCREV = "514a87f3b64181e384399935a5708a8f85b0cc83"
PE = "2"
-PV = "2.8.1+git${SRCPV}"
-SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.8 \
+SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \
file://lttng-ust-doc-examples-disable.patch \
"
+SRC_URI[md5sum] = "77f3378ba37a36801420bce87b702e9c"
+SRC_URI[sha256sum] = "4d541a863f42dfc685ca05024027a442c70d03594c154a43e62bc109b1ea5daf"
PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native xmlto-native libxslt-native"
@@ -33,10 +33,3 @@ do_install_append() {
# still refer to Python 2 in the shebang
sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${bindir}/lttng-gen-tp
}
-
-
-S = "${WORKDIR}/git"
-
-do_configure_prepend () {
- ( cd ${S}; ${S}/bootstrap )
-}
--
2.7.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/5] lttng-modules: upgrade to 2.9.0
2017-01-10 23:06 [PATCH 0/5] LTTng, Babeltrace updates Nathan Lynch
2017-01-10 23:06 ` [PATCH 1/5] lttng-ust: don't exclude manual pages from build Nathan Lynch
2017-01-10 23:06 ` [PATCH 2/5] lttng-ust: upgrade to 2.9.0 Nathan Lynch
@ 2017-01-10 23:06 ` Nathan Lynch
2017-02-25 17:30 ` Bruce Ashfield
2017-01-10 23:06 ` [PATCH 4/5] lttng-tools: upgrade to 2.9.3 Nathan Lynch
2017-01-10 23:07 ` [PATCH 5/5] babeltrace: upgrade to 1.5.1 Nathan Lynch
4 siblings, 1 reply; 12+ messages in thread
From: Nathan Lynch @ 2017-01-10 23:06 UTC (permalink / raw)
To: openembedded-core
Switch to using release tarballs.
Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
---
.../lttng/{lttng-modules_git.bb => lttng-modules_2.9.0.bb} | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
rename meta/recipes-kernel/lttng/{lttng-modules_git.bb => lttng-modules_2.9.0.bb} (84%)
diff --git a/meta/recipes-kernel/lttng/lttng-modules_git.bb b/meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb
similarity index 84%
rename from meta/recipes-kernel/lttng/lttng-modules_git.bb
rename to meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb
index 8a287131d06d..e59d6bc1379c 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_git.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb
@@ -8,20 +8,18 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=362844633a08753bd96ab322a6c7f9f6 \
inherit module
-SRCREV = "6e4fc6f36d68fb3c8d40113f8670eb6e9c8ffd76"
-PV = "2.8.0+git${SRCPV}"
-
COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm).*-linux'
-SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.8 \
+SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch"
+SRC_URI[md5sum] = "717df375ccb6f32bb297cc2f2e692bbf"
+SRC_URI[sha256sum] = "af914e5954081cfb6bd4c6dcf9390474e0c13fe056b12b3dfc86d1b88b8340a0"
+
export INSTALL_MOD_DIR="kernel/lttng-modules"
EXTRA_OEMAKE += "KERNELDIR='${STAGING_KERNEL_DIR}'"
-S = "${WORKDIR}/git"
-
do_install_append() {
# Delete empty directories to avoid QA failures if no modules were built
find ${D}/lib -depth -type d -empty -exec rmdir {} \;
--
2.7.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 4/5] lttng-tools: upgrade to 2.9.3
2017-01-10 23:06 [PATCH 0/5] LTTng, Babeltrace updates Nathan Lynch
` (2 preceding siblings ...)
2017-01-10 23:06 ` [PATCH 3/5] lttng-modules: " Nathan Lynch
@ 2017-01-10 23:06 ` Nathan Lynch
2017-01-12 11:38 ` Burton, Ross
2017-01-10 23:07 ` [PATCH 5/5] babeltrace: upgrade to 1.5.1 Nathan Lynch
4 siblings, 1 reply; 12+ messages in thread
From: Nathan Lynch @ 2017-01-10 23:06 UTC (permalink / raw)
To: openembedded-core
Notable recipe changes:
* switch to using release tarball
* brokensep no longer required
* drop upstreamed error.h patch
* change do_install_ptest to selectively copy build artifacts to
install tree.
* use backported patch to address file-rdeps warning
Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
---
.../0001-Fix-error.h-common-error.h.patch | 33 -----
meta/recipes-kernel/lttng/lttng-tools/run-ptest | 5 +-
.../utils-remove-bogus-interpreter.patch | 35 +++++
.../{lttng-tools_git.bb => lttng-tools_2.9.3.bb} | 142 +++++++++++----------
4 files changed, 112 insertions(+), 103 deletions(-)
delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-common-error.h.patch
create mode 100644 meta/recipes-kernel/lttng/lttng-tools/utils-remove-bogus-interpreter.patch
rename meta/recipes-kernel/lttng/{lttng-tools_git.bb => lttng-tools_2.9.3.bb} (39%)
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-common-error.h.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-common-error.h.patch
deleted file mode 100644
index 6c8a9b211a08..000000000000
--- a/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-common-error.h.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 6712db617fe9155ea236f6840c2bd18dbec4c871 Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <mjeanson@efficios.com>
-Date: Wed, 15 Jun 2016 17:18:03 -0400
-Subject: [PATCH] Fix: error.h -> common/error.h
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Backport
-
-Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
-Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
-Signed-off-by: Peter Liu <peter.x.liu@external.atlascopco.com>
----
- src/bin/lttng-sessiond/agent.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c
-index 7cbbbde..310a7e8 100644
---- a/src/bin/lttng-sessiond/agent.c
-+++ b/src/bin/lttng-sessiond/agent.c
-@@ -29,7 +29,7 @@
- #include "agent.h"
- #include "ust-app.h"
- #include "utils.h"
--#include "error.h"
-+#include "common/error.h"
-
- #define AGENT_RET_CODE_INDEX(code) (code - AGENT_RET_CODE_SUCCESS)
-
---
-1.9.1
-
diff --git a/meta/recipes-kernel/lttng/lttng-tools/run-ptest b/meta/recipes-kernel/lttng/lttng-tools/run-ptest
index 6230063442d6..705030ee53b8 100755
--- a/meta/recipes-kernel/lttng/lttng-tools/run-ptest
+++ b/meta/recipes-kernel/lttng/lttng-tools/run-ptest
@@ -1,5 +1,6 @@
#!/bin/sh
# 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"
-make -t all >/dev/null 2>&1 && exec make -s $makeargs check 2>/dev/null
+makeargs="LOG_DRIVER_FLAGS=--ignore-exit top_srcdir=$PWD top_builddir=$PWD"
+make -k -t all >/dev/null 2>&1
+exec make -s $makeargs check 2>/dev/null
diff --git a/meta/recipes-kernel/lttng/lttng-tools/utils-remove-bogus-interpreter.patch b/meta/recipes-kernel/lttng/lttng-tools/utils-remove-bogus-interpreter.patch
new file mode 100644
index 000000000000..f08198208d4f
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-tools/utils-remove-bogus-interpreter.patch
@@ -0,0 +1,35 @@
+From 4545eae3bccb0f5a97509d1405a28000029a8d7d Mon Sep 17 00:00:00 2001
+From: Nathan Lynch <nathan_lynch@mentor.com>
+Date: Mon, 9 Jan 2017 16:14:28 -0600
+Subject: [PATCH] lttng-tools: remove bogus interpreter line from utils shell
+ library
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+tests/utils/utils.sh is always sourced, never executed, and
+/src/bin/bash is not a typical path for a shell interpreter. Just
+delete it.
+
+Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
+Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
+---
+
+Upstream-Status: Backport
+
+ tests/utils/utils.sh | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
+index 05d88650e9f3..9db0640b70f3 100644
+--- a/tests/utils/utils.sh
++++ b/tests/utils/utils.sh
+@@ -1,5 +1,3 @@
+-#!/src/bin/bash
+-#
+ # Copyright (C) - 2012 David Goulet <dgoulet@efficios.com>
+ #
+ # This library is free software; you can redistribute it and/or modify it under
+--
+2.7.4
+
diff --git a/meta/recipes-kernel/lttng/lttng-tools_git.bb b/meta/recipes-kernel/lttng/lttng-tools_2.9.3.bb
similarity index 39%
rename from meta/recipes-kernel/lttng/lttng-tools_git.bb
rename to meta/recipes-kernel/lttng/lttng-tools_2.9.3.bb
index 29fd75b21705..0506feb0136c 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_git.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.9.3.bb
@@ -15,9 +15,6 @@ RDEPENDS_${PN}-ptest += "make perl bash gawk ${PN} babeltrace procps"
# babelstats.pl wants getopt-long
RDEPENDS_${PN}-ptest += "perl-module-getopt-long"
-SRCREV = "d11e0dba0df9024b8613c51e167a379b91e8b20b"
-PV = "2.8.1+git${SRCPV}"
-
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}' \
@@ -29,14 +26,15 @@ PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod"
PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native xmlto-native libxslt-native"
PACKAGECONFIG_remove_libc-musl = "lttng-ust"
-SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.8 \
- file://0001-Fix-error.h-common-error.h.patch \
+SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
file://x32.patch \
+ file://utils-remove-bogus-interpreter.patch \
file://run-ptest"
-S = "${WORKDIR}/git"
+SRC_URI[md5sum] = "19fdcc5e9c307ef66581a2743a08a541"
+SRC_URI[sha256sum] = "a6e6baaaa977dcbc9bce6b675881eec664599b86f0d905a7b0b508539407b24e"
-inherit autotools-brokensep ptest pkgconfig useradd python3-dir manpages
+inherit autotools ptest pkgconfig useradd python3-dir manpages
USERADD_PACKAGES = "${PN}"
GROUPADD_PARAM_${PN} = "tracing"
@@ -53,68 +51,76 @@ 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}/m4/libxml.m4
+ # Delete a shipped m4 file that overrides our patched one
+ rm -f ${S}/m4/libxml.m4
}
do_install_ptest () {
- 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
-
- # 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
-
- # checkpatch.pl is unneeded on target and causes file-rdeps QA
- # warnings.
- rm -f ${D}${PTEST_PATH}/extras/checkpatch.pl
-
- # Remove built libraries as they confuse the packages' runtime dependency resolution
- rm -rf ${D}${PTEST_PATH}/src/lib/lttng-ctl/.libs/
+ for f in Makefile tests/Makefile tests/utils/utils.sh ; do
+ install -D "${B}/$f" "${D}${PTEST_PATH}/$f"
+ done
+
+ for f in config/tap-driver.sh config/test-driver ; do
+ install -D "${S}/$f" "${D}${PTEST_PATH}/$f"
+ done
+
+ # Prevent 'make check' from recursing into non-test subdirectories.
+ sed -i -e 's!^SUBDIRS = .*!SUBDIRS = tests!' "${D}${PTEST_PATH}/Makefile"
+
+ # We don't need these
+ sed -i -e '/dist_noinst_SCRIPTS = /,/^$/d' "${D}${PTEST_PATH}/tests/Makefile"
+
+ # We shouldn't need to build anything in tests/utils
+ sed -i -e 's!am__append_1 = . utils!am__append_1 = . !' \
+ "${D}${PTEST_PATH}/tests/Makefile"
+
+ # Copy the tests directory tree and the executables and
+ # Makefiles found within.
+ for d in $(find "${B}/tests" -type d -not -name .libs -printf '%P ') ; do
+ find "${B}/tests/$d" -maxdepth 1 -executable -type f \
+ -exec install -D -t "${D}${PTEST_PATH}/tests/$d" {} +
+ test -r "${B}/tests/$d/Makefile" && \
+ install -D -t "${D}${PTEST_PATH}/tests/$d" "${B}/tests/$d/Makefile"
+ done
+
+ # We shouldn't need to build anything in tests/regression/tools
+ sed -i -e 's!^SUBDIRS = tools !SUBDIRS = !' \
+ "${D}${PTEST_PATH}/tests/regression/Makefile"
+
+ # 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:/' \
+ {} +
+
+ # These objects trigger [rpaths] QA checks; the test harness
+ # skips the associated tests if they're missing, so delete
+ # them.
+ objs=""
+ objs="$objs regression/ust/ust-dl/libbar.so"
+ objs="$objs regression/ust/ust-dl/libfoo.so"
+ for obj in $objs ; do
+ rm -f "${D}${PTEST_PATH}/tests/${obj}"
+ done
+
+ find "${D}${PTEST_PATH}" -name Makefile -type f -exec \
+ touch -r "${B}/Makefile" {} +
+
+ # Substitute links to installed binaries.
+ for prog in lttng lttng-relayd lttng-sessiond lttng-consumerd ; do
+ exedir="${D}${PTEST_PATH}/src/bin/${prog}"
+ install -d "$exedir"
+ case "$prog" in
+ lttng-consumerd)
+ ln -s "${libdir}/lttng/libexec/$prog" "$exedir"
+ ;;
+ *)
+ ln -s "${bindir}/$prog" "$exedir"
+ ;;
+ esac
+ done
}
--
2.7.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 5/5] babeltrace: upgrade to 1.5.1
2017-01-10 23:06 [PATCH 0/5] LTTng, Babeltrace updates Nathan Lynch
` (3 preceding siblings ...)
2017-01-10 23:06 ` [PATCH 4/5] lttng-tools: upgrade to 2.9.3 Nathan Lynch
@ 2017-01-10 23:07 ` Nathan Lynch
4 siblings, 0 replies; 12+ messages in thread
From: Nathan Lynch @ 2017-01-10 23:07 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
---
.../lttng/{babeltrace_1.5.0.bb => babeltrace_1.5.1.bb} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta/recipes-kernel/lttng/{babeltrace_1.5.0.bb => babeltrace_1.5.1.bb} (81%)
diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.0.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.1.bb
similarity index 81%
rename from meta/recipes-kernel/lttng/babeltrace_1.5.0.bb
rename to meta/recipes-kernel/lttng/babeltrace_1.5.1.bb
index 695b61f9c4a2..c22b3a01b4ac 100644
--- a/meta/recipes-kernel/lttng/babeltrace_1.5.0.bb
+++ b/meta/recipes-kernel/lttng/babeltrace_1.5.1.bb
@@ -15,6 +15,5 @@ SRC_URI = "http://www.efficios.com/files/babeltrace/babeltrace-${PV}.tar.bz2 \
EXTRA_OECONF = "--disable-debug-info"
-SRC_URI[md5sum] = "43696383e44d1b85173db7cbd0335f06"
-SRC_URI[sha256sum] = "354e75d74562f5228ab89e5fa16a3b4dffa95e7230c5086b74ffcf11fef60353"
-
+SRC_URI[md5sum] = "3f7d29ba2821a966d24759a928a15cdf"
+SRC_URI[sha256sum] = "379e96f1cf867f0a198cf1c315c52ec7d7ad67898402bbe22d1404fc38d19d98"
--
2.7.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 4/5] lttng-tools: upgrade to 2.9.3
2017-01-10 23:06 ` [PATCH 4/5] lttng-tools: upgrade to 2.9.3 Nathan Lynch
@ 2017-01-12 11:38 ` Burton, Ross
2017-01-12 17:59 ` Nathan Lynch
0 siblings, 1 reply; 12+ messages in thread
From: Burton, Ross @ 2017-01-12 11:38 UTC (permalink / raw)
To: Nathan Lynch; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 13142 bytes --]
Hi,
This upgrade is failing on the autobuilders:
DEBUG: Executing shell function do_install_ptest_base
install: failed to access
‘TOPDIR/tmp/work/mips64-poky-linux/lttng-tools/2.9.3-r0/image/usr/lib/lttng-tools/ptest/tests/destructive’:
No such file or directory
Ross
On 10 January 2017 at 23:06, Nathan Lynch <nathan_lynch@mentor.com> wrote:
> Notable recipe changes:
>
> * switch to using release tarball
> * brokensep no longer required
> * drop upstreamed error.h patch
> * change do_install_ptest to selectively copy build artifacts to
> install tree.
> * use backported patch to address file-rdeps warning
>
> Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
> ---
> .../0001-Fix-error.h-common-error.h.patch | 33 -----
> meta/recipes-kernel/lttng/lttng-tools/run-ptest | 5 +-
> .../utils-remove-bogus-interpreter.patch | 35 +++++
> .../{lttng-tools_git.bb => lttng-tools_2.9.3.bb} | 142
> +++++++++++----------
> 4 files changed, 112 insertions(+), 103 deletions(-)
> delete mode 100644 meta/recipes-kernel/lttng/
> lttng-tools/0001-Fix-error.h-common-error.h.patch
> create mode 100644 meta/recipes-kernel/lttng/lttng-tools/utils-remove-
> bogus-interpreter.patch
> rename meta/recipes-kernel/lttng/{lttng-tools_git.bb =>
> lttng-tools_2.9.3.bb} (39%)
>
> diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-common-error.h.patch
> b/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-
> common-error.h.patch
> deleted file mode 100644
> index 6c8a9b211a08..000000000000
> --- a/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-
> common-error.h.patch
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -From 6712db617fe9155ea236f6840c2bd18dbec4c871 Mon Sep 17 00:00:00 2001
> -From: Michael Jeanson <mjeanson@efficios.com>
> -Date: Wed, 15 Jun 2016 17:18:03 -0400
> -Subject: [PATCH] Fix: error.h -> common/error.h
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -Upstream-Status: Backport
> -
> -Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
> -Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
> -Signed-off-by: Peter Liu <peter.x.liu@external.atlascopco.com>
> ----
> - src/bin/lttng-sessiond/agent.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/
> agent.c
> -index 7cbbbde..310a7e8 100644
> ---- a/src/bin/lttng-sessiond/agent.c
> -+++ b/src/bin/lttng-sessiond/agent.c
> -@@ -29,7 +29,7 @@
> - #include "agent.h"
> - #include "ust-app.h"
> - #include "utils.h"
> --#include "error.h"
> -+#include "common/error.h"
> -
> - #define AGENT_RET_CODE_INDEX(code) (code - AGENT_RET_CODE_SUCCESS)
> -
> ---
> -1.9.1
> -
> diff --git a/meta/recipes-kernel/lttng/lttng-tools/run-ptest
> b/meta/recipes-kernel/lttng/lttng-tools/run-ptest
> index 6230063442d6..705030ee53b8 100755
> --- a/meta/recipes-kernel/lttng/lttng-tools/run-ptest
> +++ b/meta/recipes-kernel/lttng/lttng-tools/run-ptest
> @@ -1,5 +1,6 @@
> #!/bin/sh
> # 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"
> -make -t all >/dev/null 2>&1 && exec make -s $makeargs check 2>/dev/null
> +makeargs="LOG_DRIVER_FLAGS=--ignore-exit top_srcdir=$PWD
> top_builddir=$PWD"
> +make -k -t all >/dev/null 2>&1
> +exec make -s $makeargs check 2>/dev/null
> diff --git a/meta/recipes-kernel/lttng/lttng-tools/utils-remove-bogus-interpreter.patch
> b/meta/recipes-kernel/lttng/lttng-tools/utils-remove-
> bogus-interpreter.patch
> new file mode 100644
> index 000000000000..f08198208d4f
> --- /dev/null
> +++ b/meta/recipes-kernel/lttng/lttng-tools/utils-remove-
> bogus-interpreter.patch
> @@ -0,0 +1,35 @@
> +From 4545eae3bccb0f5a97509d1405a28000029a8d7d Mon Sep 17 00:00:00 2001
> +From: Nathan Lynch <nathan_lynch@mentor.com>
> +Date: Mon, 9 Jan 2017 16:14:28 -0600
> +Subject: [PATCH] lttng-tools: remove bogus interpreter line from utils
> shell
> + library
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +tests/utils/utils.sh is always sourced, never executed, and
> +/src/bin/bash is not a typical path for a shell interpreter. Just
> +delete it.
> +
> +Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
> +Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
> +---
> +
> +Upstream-Status: Backport
> +
> + tests/utils/utils.sh | 2 --
> + 1 file changed, 2 deletions(-)
> +
> +diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
> +index 05d88650e9f3..9db0640b70f3 100644
> +--- a/tests/utils/utils.sh
> ++++ b/tests/utils/utils.sh
> +@@ -1,5 +1,3 @@
> +-#!/src/bin/bash
> +-#
> + # Copyright (C) - 2012 David Goulet <dgoulet@efficios.com>
> + #
> + # This library is free software; you can redistribute it and/or modify
> it under
> +--
> +2.7.4
> +
> diff --git a/meta/recipes-kernel/lttng/lttng-tools_git.bb
> b/meta/recipes-kernel/lttng/lttng-tools_2.9.3.bb
> similarity index 39%
> rename from meta/recipes-kernel/lttng/lttng-tools_git.bb
> rename to meta/recipes-kernel/lttng/lttng-tools_2.9.3.bb
> index 29fd75b21705..0506feb0136c 100644
> --- a/meta/recipes-kernel/lttng/lttng-tools_git.bb
> +++ b/meta/recipes-kernel/lttng/lttng-tools_2.9.3.bb
> @@ -15,9 +15,6 @@ RDEPENDS_${PN}-ptest += "make perl bash gawk ${PN}
> babeltrace procps"
> # babelstats.pl wants getopt-long
> RDEPENDS_${PN}-ptest += "perl-module-getopt-long"
>
> -SRCREV = "d11e0dba0df9024b8613c51e167a379b91e8b20b"
> -PV = "2.8.1+git${SRCPV}"
> -
> 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}'
> \
> @@ -29,14 +26,15 @@ PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod,
> kmod"
> PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages,
> asciidoc-native xmlto-native libxslt-native"
> PACKAGECONFIG_remove_libc-musl = "lttng-ust"
>
> -SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.8 \
> - file://0001-Fix-error.h-common-error.h.patch \
> +SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2
> \
> file://x32.patch \
> + file://utils-remove-bogus-interpreter.patch \
> file://run-ptest"
>
> -S = "${WORKDIR}/git"
> +SRC_URI[md5sum] = "19fdcc5e9c307ef66581a2743a08a541"
> +SRC_URI[sha256sum] = "a6e6baaaa977dcbc9bce6b675881ee
> c664599b86f0d905a7b0b508539407b24e"
>
> -inherit autotools-brokensep ptest pkgconfig useradd python3-dir manpages
> +inherit autotools ptest pkgconfig useradd python3-dir manpages
>
> USERADD_PACKAGES = "${PN}"
> GROUPADD_PARAM_${PN} = "tracing"
> @@ -53,68 +51,76 @@ 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}/m4/libxml.m4
> + # Delete a shipped m4 file that overrides our patched one
> + rm -f ${S}/m4/libxml.m4
> }
>
> do_install_ptest () {
> - 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
> -
> - # 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
> -
> - # checkpatch.pl is unneeded on target and causes file-rdeps QA
> - # warnings.
> - rm -f ${D}${PTEST_PATH}/extras/checkpatch.pl
> -
> - # Remove built libraries as they confuse the packages' runtime
> dependency resolution
> - rm -rf ${D}${PTEST_PATH}/src/lib/lttng-ctl/.libs/
> + for f in Makefile tests/Makefile tests/utils/utils.sh ; do
> + install -D "${B}/$f" "${D}${PTEST_PATH}/$f"
> + done
> +
> + for f in config/tap-driver.sh config/test-driver ; do
> + install -D "${S}/$f" "${D}${PTEST_PATH}/$f"
> + done
> +
> + # Prevent 'make check' from recursing into non-test subdirectories.
> + sed -i -e 's!^SUBDIRS = .*!SUBDIRS = tests!'
> "${D}${PTEST_PATH}/Makefile"
> +
> + # We don't need these
> + sed -i -e '/dist_noinst_SCRIPTS = /,/^$/d' "${D}${PTEST_PATH}/tests/
> Makefile"
> +
> + # We shouldn't need to build anything in tests/utils
> + sed -i -e 's!am__append_1 = . utils!am__append_1 = . !' \
> + "${D}${PTEST_PATH}/tests/Makefile"
> +
> + # Copy the tests directory tree and the executables and
> + # Makefiles found within.
> + for d in $(find "${B}/tests" -type d -not -name .libs -printf '%P ')
> ; do
> + find "${B}/tests/$d" -maxdepth 1 -executable -type f \
> + -exec install -D -t "${D}${PTEST_PATH}/tests/$d" {} +
> + test -r "${B}/tests/$d/Makefile" && \
> + install -D -t "${D}${PTEST_PATH}/tests/$d"
> "${B}/tests/$d/Makefile"
> + done
> +
> + # We shouldn't need to build anything in tests/regression/tools
> + sed -i -e 's!^SUBDIRS = tools !SUBDIRS = !' \
> + "${D}${PTEST_PATH}/tests/regression/Makefile"
> +
> + # 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:/' \
> + {} +
> +
> + # These objects trigger [rpaths] QA checks; the test harness
> + # skips the associated tests if they're missing, so delete
> + # them.
> + objs=""
> + objs="$objs regression/ust/ust-dl/libbar.so"
> + objs="$objs regression/ust/ust-dl/libfoo.so"
> + for obj in $objs ; do
> + rm -f "${D}${PTEST_PATH}/tests/${obj}"
> + done
> +
> + find "${D}${PTEST_PATH}" -name Makefile -type f -exec \
> + touch -r "${B}/Makefile" {} +
> +
> + # Substitute links to installed binaries.
> + for prog in lttng lttng-relayd lttng-sessiond lttng-consumerd ; do
> + exedir="${D}${PTEST_PATH}/src/bin/${prog}"
> + install -d "$exedir"
> + case "$prog" in
> + lttng-consumerd)
> + ln -s "${libdir}/lttng/libexec/$prog" "$exedir"
> + ;;
> + *)
> + ln -s "${bindir}/$prog" "$exedir"
> + ;;
> + esac
> + done
> }
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 17745 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 4/5] lttng-tools: upgrade to 2.9.3
2017-01-12 11:38 ` Burton, Ross
@ 2017-01-12 17:59 ` Nathan Lynch
2017-01-13 15:01 ` Nathan Lynch
0 siblings, 1 reply; 12+ messages in thread
From: Nathan Lynch @ 2017-01-12 17:59 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
"Burton, Ross" <ross.burton@intel.com> writes:
> Hi,
>
> This upgrade is failing on the autobuilders:
>
> DEBUG: Executing shell function do_install_ptest_base
> install: failed to access
> ‘TOPDIR/tmp/work/mips64-poky-linux/lttng-tools/2.9.3-r0/image/usr/lib/lttng-tools/ptest/tests/destructive’:
> No such file or directory
I'm unable to recreate this so far. Any idea what's going on here?
Here's the relevant code from the recipe's do_install_ptest:
# Copy the tests directory tree and the executables and
# Makefiles found within.
for d in $(find "${B}/tests" -type d -not -name .libs -printf '%P ') ; do
find "${B}/tests/$d" -maxdepth 1 -executable -type f \
-exec install -D -t "${D}${PTEST_PATH}/tests/$d" {} +
test -r "${B}/tests/$d/Makefile" && \
install -D -t "${D}${PTEST_PATH}/tests/$d" "${B}/tests/$d/Makefile"
done
And the contents of ${B}/tests/destructive/:
-rwxr-xr-x. 3 nathanl nathanl 19298 Jan 12 10:42 Makefile
-rwxr-xr-x. 3 nathanl nathanl 6547 Jan 12 10:44 metadata-regeneration
I'm guessing it's something like a directory creation race but I can't
see it.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 4/5] lttng-tools: upgrade to 2.9.3
2017-01-12 17:59 ` Nathan Lynch
@ 2017-01-13 15:01 ` Nathan Lynch
0 siblings, 0 replies; 12+ messages in thread
From: Nathan Lynch @ 2017-01-13 15:01 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
Nathan Lynch <nathan_lynch@mentor.com> writes:
> "Burton, Ross" <ross.burton@intel.com> writes:
>
>> This upgrade is failing on the autobuilders:
>>
>> DEBUG: Executing shell function do_install_ptest_base
>> install: failed to access
>> ‘TOPDIR/tmp/work/mips64-poky-linux/lttng-tools/2.9.3-r0/image/usr/lib/lttng-tools/ptest/tests/destructive’:
>> No such file or directory
>
> I'm unable to recreate this so far. Any idea what's going on here?
>
> Here's the relevant code from the recipe's do_install_ptest:
>
> # Copy the tests directory tree and the executables and
> # Makefiles found within.
> for d in $(find "${B}/tests" -type d -not -name .libs -printf '%P ') ; do
> find "${B}/tests/$d" -maxdepth 1 -executable -type f \
> -exec install -D -t "${D}${PTEST_PATH}/tests/$d" {} +
> test -r "${B}/tests/$d/Makefile" && \
> install -D -t "${D}${PTEST_PATH}/tests/$d" "${B}/tests/$d/Makefile"
> done
>
> And the contents of ${B}/tests/destructive/:
> -rwxr-xr-x. 3 nathanl nathanl 19298 Jan 12 10:42 Makefile
> -rwxr-xr-x. 3 nathanl nathanl 6547 Jan 12 10:44 metadata-regeneration
>
> I'm guessing it's something like a directory creation race but I can't
> see it.
This seems like a plausible explanation (a difference in install -D
behavior):
http://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=6c65ce4c643b038c61bd332aab5ea87a75117273
I've got coreutils 8.25 here; I assume the version on the autobuilder is
older than that but newer than 6.2.
I'll verify this theory and likely respin to work around the old
coreutils.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 3/5] lttng-modules: upgrade to 2.9.0
2017-01-10 23:06 ` [PATCH 3/5] lttng-modules: " Nathan Lynch
@ 2017-02-25 17:30 ` Bruce Ashfield
2017-02-26 4:23 ` Nathan Lynch
0 siblings, 1 reply; 12+ messages in thread
From: Bruce Ashfield @ 2017-02-25 17:30 UTC (permalink / raw)
To: Nathan Lynch; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 2989 bytes --]
Following up on this old patch .. since it causing a problem with my
introduction of
the 4.10 kernel.
I'm going to have to switch back to the git fetching of lttng to easily
pull in the latest
changes to adapt to the 4.10 kernel.
lttng just doesn't release often enough for bleeding edge kernels, and
while maintaining
a set of patches on top of the released version is possible .. I don't see
the point.
I missed the discussion on this one when it first came out, so I missed the
reason that
we switched away from git to the release tarballs ?
I also didn't find it in my archived email, so before I go ahead and make a
_git variant of
the recipe again I wanted to check in and make sure that I'm not going to
break a
workflow or undo something that was being fixed.
Cheers,
Bruce
On Tue, Jan 10, 2017 at 6:06 PM, Nathan Lynch <nathan_lynch@mentor.com>
wrote:
> Switch to using release tarballs.
>
> Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
> ---
> .../lttng/{lttng-modules_git.bb => lttng-modules_2.9.0.bb} | 10
> ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
> rename meta/recipes-kernel/lttng/{lttng-modules_git.bb =>
> lttng-modules_2.9.0.bb} (84%)
>
> diff --git a/meta/recipes-kernel/lttng/lttng-modules_git.bb
> b/meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb
> similarity index 84%
> rename from meta/recipes-kernel/lttng/lttng-modules_git.bb
> rename to meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb
> index 8a287131d06d..e59d6bc1379c 100644
> --- a/meta/recipes-kernel/lttng/lttng-modules_git.bb
> +++ b/meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb
> @@ -8,20 +8,18 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=
> 362844633a08753bd96ab322a6c7f9f6 \
>
> inherit module
>
> -SRCREV = "6e4fc6f36d68fb3c8d40113f8670eb6e9c8ffd76"
> -PV = "2.8.0+git${SRCPV}"
> -
> COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm).*-linux'
>
> -SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.8 \
> +SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \
> file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-
> en.patch"
>
> +SRC_URI[md5sum] = "717df375ccb6f32bb297cc2f2e692bbf"
> +SRC_URI[sha256sum] = "af914e5954081cfb6bd4c6dcf93904
> 74e0c13fe056b12b3dfc86d1b88b8340a0"
> +
> export INSTALL_MOD_DIR="kernel/lttng-modules"
>
> EXTRA_OEMAKE += "KERNELDIR='${STAGING_KERNEL_DIR}'"
>
> -S = "${WORKDIR}/git"
> -
> do_install_append() {
> # Delete empty directories to avoid QA failures if no modules were
> built
> find ${D}/lib -depth -type d -empty -exec rmdir {} \;
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"
[-- Attachment #2: Type: text/html, Size: 5202 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 3/5] lttng-modules: upgrade to 2.9.0
2017-02-25 17:30 ` Bruce Ashfield
@ 2017-02-26 4:23 ` Nathan Lynch
2017-02-26 21:02 ` Bruce Ashfield
0 siblings, 1 reply; 12+ messages in thread
From: Nathan Lynch @ 2017-02-26 4:23 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: Patches and discussions about the oe-core layer
Bruce Ashfield <bruce.ashfield@gmail.com> writes:
> Following up on this old patch .. since it causing a problem with my
> introduction of
> the 4.10 kernel.
>
> I'm going to have to switch back to the git fetching of lttng to easily
> pull in the latest
> changes to adapt to the 4.10 kernel.
I don't see why. Support for 4.10 has been in lttng-modules' stable-2.9
branch since January, and is included in the v2.9.1 release, which was
tagged a week ago, right before the 4.10 release. I had intended to
send the update for lttng-modules on Monday but since I've got it ready
I'll send it in a few minutes.
You should not need to use lttng-modules' master branch to work with
released Linux versions.
> lttng just doesn't release often enough for bleeding edge kernels,
That's not my impression at all. The LTTng project diligently tracks
upstream kernel development and ensures that the latest stable branch of
lttng-modules supports the latest released kernel.
> while maintaining
> a set of patches on top of the released version is possible .. I don't see
> the point.
Maintaining a set of patches on top of the released version of
lttng-modules should not be necessary.
> I missed the discussion on this one when it first came out, so I missed the
> reason that
> we switched away from git to the release tarballs ?
I know there's a diversity of opinion on the subject in general, but in
the absence of a need to use git, I think using a release tarball should
be preferred.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 3/5] lttng-modules: upgrade to 2.9.0
2017-02-26 4:23 ` Nathan Lynch
@ 2017-02-26 21:02 ` Bruce Ashfield
0 siblings, 0 replies; 12+ messages in thread
From: Bruce Ashfield @ 2017-02-26 21:02 UTC (permalink / raw)
To: Nathan Lynch; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 2501 bytes --]
On Sat, Feb 25, 2017 at 11:23 PM, Nathan Lynch <nathan_lynch@mentor.com>
wrote:
> Bruce Ashfield <bruce.ashfield@gmail.com> writes:
>
> > Following up on this old patch .. since it causing a problem with my
> > introduction of
> > the 4.10 kernel.
> >
> > I'm going to have to switch back to the git fetching of lttng to easily
> > pull in the latest
> > changes to adapt to the 4.10 kernel.
>
> I don't see why. Support for 4.10 has been in lttng-modules' stable-2.9
> branch since January, and is included in the v2.9.1 release, which was
> tagged a week ago, right before the 4.10 release. I had intended to
> send the update for lttng-modules on Monday but since I've got it ready
> I'll send it in a few minutes.
>
> You should not need to use lttng-modules' master branch to work with
> released Linux versions.
>
Yup. If you look at the history of our lttng recipe .. I've ben hacking on
it for quite some time.
>
>
> > lttng just doesn't release often enough for bleeding edge kernels,
>
> That's not my impression at all. The LTTng project diligently tracks
> upstream kernel development and ensures that the latest stable branch of
> lttng-modules supports the latest released kernel.
>
I didn't say they didn't do that. I'm saying that they don't spin enough
tarballs at times.
>
>
> > while maintaining
> > a set of patches on top of the released version is possible .. I don't
> see
> > the point.
>
> Maintaining a set of patches on top of the released version of
> lttng-modules should not be necessary.
>
It is .. I'm always ahead of released kernels. So when I work with a -dev
kernel, waiting for lttng to release doesn't work. I would have put out 4.10
a few weeks ago, but instead I kept waiting.
>
> > I missed the discussion on this one when it first came out, so I missed
> the
> > reason that
> > we switched away from git to the release tarballs ?
>
> I know there's a diversity of opinion on the subject in general, but in
> the absence of a need to use git, I think using a release tarball should
> be preferred.
>
In this case, I'm switching back to git, since for anyone working on newer
or in-devel kernels, the release process is just too slow. I'll avoid it
since
you just put out the update, but when I start tracking 4.11 in a few weeks
.. it will again break the builds.
Bruce
--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"
[-- Attachment #2: Type: text/html, Size: 3805 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2017-02-26 21:02 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-10 23:06 [PATCH 0/5] LTTng, Babeltrace updates Nathan Lynch
2017-01-10 23:06 ` [PATCH 1/5] lttng-ust: don't exclude manual pages from build Nathan Lynch
2017-01-10 23:06 ` [PATCH 2/5] lttng-ust: upgrade to 2.9.0 Nathan Lynch
2017-01-10 23:06 ` [PATCH 3/5] lttng-modules: " Nathan Lynch
2017-02-25 17:30 ` Bruce Ashfield
2017-02-26 4:23 ` Nathan Lynch
2017-02-26 21:02 ` Bruce Ashfield
2017-01-10 23:06 ` [PATCH 4/5] lttng-tools: upgrade to 2.9.3 Nathan Lynch
2017-01-12 11:38 ` Burton, Ross
2017-01-12 17:59 ` Nathan Lynch
2017-01-13 15:01 ` Nathan Lynch
2017-01-10 23:07 ` [PATCH 5/5] babeltrace: upgrade to 1.5.1 Nathan Lynch
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.