diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
| commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
| tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-tests-link-libpause_consumer-on-liblttng-ctl.patch | |
| parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
| download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz | |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-tests-link-libpause_consumer-on-liblttng-ctl.patch')
| -rw-r--r-- | poky/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-tests-link-libpause_consumer-on-liblttng-ctl.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/poky/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-tests-link-libpause_consumer-on-liblttng-ctl.patch b/poky/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-tests-link-libpause_consumer-on-liblttng-ctl.patch new file mode 100644 index 000000000..df18dc842 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-tests-link-libpause_consumer-on-liblttng-ctl.patch @@ -0,0 +1,35 @@ +From 7244eac44be929fabd6ed1333f96929ef8da564f Mon Sep 17 00:00:00 2001 +From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com> +Date: Tue, 19 Mar 2019 17:56:49 +0000 +Subject: [PATCH] fix: tests: link libpause_consumer on liblttng-ctl + +This preload test library uses symbols from liblttng-ctl which are +resolved when preloaded by GLIBC but not by MUSL. + +Upstream-Status: Accepted [f667fbd7f8b9512f9943edb2597c226fcc424ee9] +Backported to 2.11 and 2.10. + +Signed-off-by: Michael Jeanson <mjeanson@efficios.com> +--- + tests/regression/tools/notification/Makefile.am | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/tests/regression/tools/notification/Makefile.am b/tests/regression/tools/notification/Makefile.am +index 41adc69..a352bb8 100644 +--- a/tests/regression/tools/notification/Makefile.am ++++ b/tests/regression/tools/notification/Makefile.am +@@ -20,7 +20,10 @@ FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \ + -rpath $(abs_builddir) + + libpause_consumer_la_SOURCES = consumer_testpoints.c +-libpause_consumer_la_LIBADD = $(top_builddir)/src/common/libcommon.la $(DL_LIBS) ++libpause_consumer_la_LIBADD = \ ++ $(top_builddir)/src/common/libcommon.la \ ++ $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \ ++ $(DL_LIBS) + libpause_consumer_la_LDFLAGS = $(FORCE_SHARED_LIB_OPTIONS) + noinst_LTLIBRARIES = libpause_consumer.la + +-- +2.17.1 + |