summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2023-02-08 08:20:57 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-02-24 16:41:46 +0000
commitffa37959e85e6e6e4e2d6f5bc90b5281ed94a0eb (patch)
tree413e940960b1d88b3886b6918473bde85b2e89d2
parent1eeda313f6871e8ed21f0770d3ffb6c7d7c5f0ec (diff)
downloadpoky-ffa37959e85e6e6e4e2d6f5bc90b5281ed94a0eb.tar.gz
lttng-tools: update 2.13.8 -> 2.13.9
2023-01-13 (National Sticker Day) LTTng modules 2.13.8 * fix: jbd2: use the correct print format * Fix: in_x32_syscall was introduced in v4.7.0 * Explicitly skip tracing x32 system calls * fix: kallsyms wrapper on ppc64el * fix: Adjust ranges for RHEL 8.6 kernels * fix: kvm-x86 requires CONFIG_KALLSYMS_ALL * fix: mm/slab_common: drop kmem_alloc & avoid dereferencing fields when not using (v6.1) Drop determinism.patch as issue resolved upstream via linked ticket. (From OE-Core rev: b2fecaaa59b29bae9c610195d1aa5be6c1878435) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit cd9e72a390efb778a6278e2e6c9604ab29d6feb9) Signed-off-by: Steve Sakoman <steve@sakoman.com> (cherry picked from commit 812fb8f02b25bfd30f6d9640cf3b50131d68e0b1) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/determinism.patch64
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_2.13.9.bb (renamed from meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb)3
2 files changed, 1 insertions, 66 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools/determinism.patch b/meta/recipes-kernel/lttng/lttng-tools/determinism.patch
deleted file mode 100644
index 0a897a8e13..0000000000
--- a/meta/recipes-kernel/lttng/lttng-tools/determinism.patch
+++ /dev/null
@@ -1,64 +0,0 @@
1This is a bit ugly. Specifing abs_builddir as an RPATH is plain wrong when
2cross compiling. Sadly, removing the rpath makes libtool/automake do
3weird things and breaks the build as shared libs are no longer generated.
4
5We already try and delete the RPATH at do_install with chrpath however
6that does leave the path in the string table so it doesn't help us
7with reproducibility.
8
9Instead, hack in a bogus but harmless path, then delete it later in
10our do_install. Ultimately we may want to pass a specific path to use
11to configure if we really do need to set an RPATH at all. It is unclear
12to me whether the tests need that or not.
13
14Fixes reproducibility issues for lttng-tools.
15
16Upstream-Status: Submitted [https://bugs.lttng.org/issues/1361 - needs discussion with upstream about the correct solution]
17RP 2021/3/1
18
19Index: lttng-tools-2.12.2/tests/regression/ust/ust-dl/Makefile.am
20===================================================================
21--- lttng-tools-2.12.2.orig/tests/regression/ust/ust-dl/Makefile.am
22+++ lttng-tools-2.12.2/tests/regression/ust/ust-dl/Makefile.am
23@@ -27,16 +27,16 @@ noinst_LTLIBRARIES = libzzz.la libbar.la
24
25 libzzz_la_SOURCES = libzzz.c libzzz.h
26 libzzz_la_LDFLAGS = -module -shared -avoid-version \
27- -rpath $(abs_builddir)
28+ -rpath /usr/lib
29
30 libbar_la_SOURCES = libbar.c libbar.h
31 libbar_la_LDFLAGS = -module -shared -avoid-version \
32- -rpath $(abs_builddir)
33+ -rpath /usr/lib
34 libbar_la_LIBADD = libzzz.la
35
36 libfoo_la_SOURCES = libfoo.c libfoo.h
37 libfoo_la_LDFLAGS = -module -shared -avoid-version \
38- -rpath $(abs_builddir)
39+ -rpath /usr/lib
40 libfoo_la_LIBADD = libbar.la
41
42 CLEANFILES = libfoo.so libfoo.so.debug libbar.so libbar.so.debug \
43@@ -44,7 +44,7 @@ CLEANFILES = libfoo.so libfoo.so.debug l
44
45 libtp_la_SOURCES = libbar-tp.h libbar-tp.c libfoo-tp.h libfoo-tp.c \
46 libzzz-tp.h libzzz-tp.c
47-libtp_la_LDFLAGS = -module -shared -rpath $(abs_builddir)
48+libtp_la_LDFLAGS = -module -shared -rpath /usr/lib
49
50 # Extract debug symbols
51 libfoo.so.debug: libfoo.la
52Index: lttng-tools-2.12.2/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am
53===================================================================
54--- lttng-tools-2.12.2.orig/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am
55+++ lttng-tools-2.12.2/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am
56@@ -5,7 +5,7 @@ AM_CFLAGS += -O0
57 noinst_LTLIBRARIES = libfoo.la
58
59 libfoo_la_SOURCES = foo.c foo.h
60-libfoo_la_LDFLAGS = -shared -module -avoid-version -rpath $(abs_builddir)/.libs/
61+libfoo_la_LDFLAGS = -shared -module -avoid-version -rpath /usr/lib
62
63 noinst_PROGRAMS = userspace-probe-elf-binary
64 userspace_probe_elf_binary_SOURCES = userspace-probe-elf-binary.c
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb b/meta/recipes-kernel/lttng/lttng-tools_2.13.9.bb
index a814eb79f9..1f6929e307 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.13.9.bb
@@ -35,11 +35,10 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
35 file://0001-tests-do-not-strip-a-helper-library.patch \ 35 file://0001-tests-do-not-strip-a-helper-library.patch \
36 file://run-ptest \ 36 file://run-ptest \
37 file://lttng-sessiond.service \ 37 file://lttng-sessiond.service \
38 file://determinism.patch \
39 file://disable-tests.patch \ 38 file://disable-tests.patch \
40 " 39 "
41 40
42SRC_URI[sha256sum] = "b1e959579b260790930b20f3c7aa7cefb8a40e0de80d4a777c2bf78c6b353dc1" 41SRC_URI[sha256sum] = "8d94dc95b608cf70216b01203a3f8242b97a232db2e23421a2f43708da08f337"
43 42
44inherit autotools ptest pkgconfig useradd python3-dir manpages systemd 43inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
45 44