diff options
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-ust/0001-Makefile.am-update-rpath-link.patch | 12 | ||||
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-ust/0001-lttng-ust-common-link-with-liburcu-explicitly.patch | 7 | ||||
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch | 14 | ||||
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-ust_2.13.7.bb (renamed from meta/recipes-kernel/lttng/lttng-ust_2.13.6.bb) | 2 |
4 files changed, 17 insertions, 18 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-ust/0001-Makefile.am-update-rpath-link.patch b/meta/recipes-kernel/lttng/lttng-ust/0001-Makefile.am-update-rpath-link.patch index cbbf1df812..6aca8f85fa 100644 --- a/meta/recipes-kernel/lttng/lttng-ust/0001-Makefile.am-update-rpath-link.patch +++ b/meta/recipes-kernel/lttng/lttng-ust/0001-Makefile.am-update-rpath-link.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 06279f50e924d1d55b43eb3b299f6633ecb1f7a4 Mon Sep 17 00:00:00 2001 | 1 | From 7d053804ab3823d40ae10d90f4efc49dbfb4cb66 Mon Sep 17 00:00:00 2001 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Wed, 22 Sep 2021 16:33:10 +0800 | 3 | Date: Wed, 22 Sep 2021 16:33:10 +0800 |
4 | Subject: [PATCH] Makefile.am: update rpath link | 4 | Subject: [PATCH] Makefile.am: update rpath link |
@@ -13,15 +13,16 @@ ld: warning: liblttng-ust-tracepoint.so.1, needed by ../../../src/lib/lttng-ust/ | |||
13 | Upstream-Status: Submitted [https://github.com/lttng/lttng-ust/pull/61] | 13 | Upstream-Status: Submitted [https://github.com/lttng/lttng-ust/pull/61] |
14 | 14 | ||
15 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | 15 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
16 | |||
16 | --- | 17 | --- |
17 | doc/examples/Makefile.am | 2 +- | 18 | doc/examples/Makefile.am | 2 +- |
18 | 1 file changed, 1 insertions(+), 1 deletions(-) | 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
19 | 20 | ||
20 | diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am | 21 | diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am |
21 | index 8ee0564..20d246c 100644 | 22 | index 57782cc..d46caa6 100644 |
22 | --- a/doc/examples/Makefile.am | 23 | --- a/doc/examples/Makefile.am |
23 | +++ b/doc/examples/Makefile.am | 24 | +++ b/doc/examples/Makefile.am |
24 | @@ -142,7 +142,7 @@ all-local: | 25 | @@ -167,7 +167,7 @@ all-local: |
25 | CFLAGS='$(CFLAGS)' \ | 26 | CFLAGS='$(CFLAGS)' \ |
26 | AM_CFLAGS='$(AM_CFLAGS)' \ | 27 | AM_CFLAGS='$(AM_CFLAGS)' \ |
27 | LDFLAGS="$(LDFLAGS)" \ | 28 | LDFLAGS="$(LDFLAGS)" \ |
@@ -30,6 +31,3 @@ index 8ee0564..20d246c 100644 | |||
30 | LTTNG_GEN_TP_PATH="$$rel_src_subdir$(top_srcdir)/tools/" \ | 31 | LTTNG_GEN_TP_PATH="$$rel_src_subdir$(top_srcdir)/tools/" \ |
31 | AM_V_P="$(AM_V_P)" \ | 32 | AM_V_P="$(AM_V_P)" \ |
32 | AM_V_at="$(AM_V_at)" \ | 33 | AM_V_at="$(AM_V_at)" \ |
33 | -- | ||
34 | 2.17.1 | ||
35 | |||
diff --git a/meta/recipes-kernel/lttng/lttng-ust/0001-lttng-ust-common-link-with-liburcu-explicitly.patch b/meta/recipes-kernel/lttng/lttng-ust/0001-lttng-ust-common-link-with-liburcu-explicitly.patch index d3c451fd2b..e85dbdb439 100644 --- a/meta/recipes-kernel/lttng/lttng-ust/0001-lttng-ust-common-link-with-liburcu-explicitly.patch +++ b/meta/recipes-kernel/lttng/lttng-ust/0001-lttng-ust-common-link-with-liburcu-explicitly.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 2058584b7e87d6bd9d1765577766e0df7752232c Mon Sep 17 00:00:00 2001 | 1 | From 27402453f25fbdb5a9fb1a1b88d1c4d9852187d2 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Sun, 5 Sep 2021 10:44:19 +0200 | 3 | Date: Sun, 5 Sep 2021 10:44:19 +0200 |
4 | Subject: [PATCH] lttng-ust-common: link with liburcu explicitly | 4 | Subject: [PATCH] lttng-ust-common: link with liburcu explicitly |
@@ -7,15 +7,16 @@ Otherwise linking errors are seen on x86-32. | |||
7 | 7 | ||
8 | Upstream-Status: Submitted [by email to lttng-dev, Francis, Jonathan] | 8 | Upstream-Status: Submitted [by email to lttng-dev, Francis, Jonathan] |
9 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | 9 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
10 | |||
10 | --- | 11 | --- |
11 | src/lib/lttng-ust-common/Makefile.am | 1 + | 12 | src/lib/lttng-ust-common/Makefile.am | 1 + |
12 | 1 file changed, 1 insertion(+) | 13 | 1 file changed, 1 insertion(+) |
13 | 14 | ||
14 | diff --git a/src/lib/lttng-ust-common/Makefile.am b/src/lib/lttng-ust-common/Makefile.am | 15 | diff --git a/src/lib/lttng-ust-common/Makefile.am b/src/lib/lttng-ust-common/Makefile.am |
15 | index caeea2b..30febf0 100644 | 16 | index 1ccc290..6531fa0 100644 |
16 | --- a/src/lib/lttng-ust-common/Makefile.am | 17 | --- a/src/lib/lttng-ust-common/Makefile.am |
17 | +++ b/src/lib/lttng-ust-common/Makefile.am | 18 | +++ b/src/lib/lttng-ust-common/Makefile.am |
18 | @@ -15,6 +15,7 @@ liblttng_ust_common_la_SOURCES = \ | 19 | @@ -16,6 +16,7 @@ liblttng_ust_common_la_SOURCES = \ |
19 | 20 | ||
20 | liblttng_ust_common_la_LIBADD = \ | 21 | liblttng_ust_common_la_LIBADD = \ |
21 | $(top_builddir)/src/common/libcommon.la \ | 22 | $(top_builddir)/src/common/libcommon.la \ |
diff --git a/meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch b/meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch index fd9b6ea7ff..7c49583e0d 100644 --- a/meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch +++ b/meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | From dd1fdc841d069dbd4e284f430a88af79de951124 Mon Sep 17 00:00:00 2001 | 1 | From f65efd963e52de51d35e2e03fb773f33dd64f565 Mon Sep 17 00:00:00 2001 |
2 | From: Robert Yang <liezhi.yang@windriver.com> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Thu, 26 Sep 2019 17:54:00 +0800 | 3 | Date: Tue, 20 Feb 2024 12:19:06 +0000 |
4 | Subject: [PATCH] python-lttngust/Makefile.am: Add --install-lib to setup.py | 4 | Subject: [PATCH] python-lttngust/Makefile.am: Add --install-lib to setup.py |
5 | 5 | ||
6 | Otherwise it may install to /usr/lib, but should be /usr/lib64 when cross | 6 | Otherwise it may install to /usr/lib, but should be /usr/lib64 when cross |
@@ -15,15 +15,15 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | |||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
16 | 16 | ||
17 | diff --git a/src/python-lttngust/Makefile.am b/src/python-lttngust/Makefile.am | 17 | diff --git a/src/python-lttngust/Makefile.am b/src/python-lttngust/Makefile.am |
18 | index f95482d..f76d95b 100644 | 18 | index d53e21d..283901e 100644 |
19 | --- a/src/python-lttngust/Makefile.am | 19 | --- a/src/python-lttngust/Makefile.am |
20 | +++ b/src/python-lttngust/Makefile.am | 20 | +++ b/src/python-lttngust/Makefile.am |
21 | @@ -32,7 +32,7 @@ install-exec-local: build-python-bindings.stamp | 21 | @@ -45,7 +45,7 @@ install-exec-local: build-python-bindings.stamp |
22 | if [ "$(DESTDIR)" != "" ]; then \ | 22 | if [ "$(DESTDIR)" != "" ]; then \ |
23 | opts="$$opts --root=$(DESTDIR)"; \ | 23 | opts="$$opts --root=$(DESTDIR)"; \ |
24 | fi; \ | 24 | fi; \ |
25 | - $(PYTHON) $(builddir)/setup.py install $$opts; | 25 | - $(PYTHON) $(builddir)/setup.py install $(PY_INSTALL_OPTS) $$opts; |
26 | + $(PYTHON) $(builddir)/setup.py install $$opts --install-lib=$(pythondir); | 26 | + $(PYTHON) $(builddir)/setup.py install $(PY_INSTALL_OPTS) $$opts --install-lib=$(pythondir); |
27 | 27 | ||
28 | clean-local: | 28 | clean-local: |
29 | rm -rf $(builddir)/build | 29 | rm -rf $(builddir)/build |
diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.13.6.bb b/meta/recipes-kernel/lttng/lttng-ust_2.13.7.bb index 424b0fa645..9509185bad 100644 --- a/meta/recipes-kernel/lttng/lttng-ust_2.13.6.bb +++ b/meta/recipes-kernel/lttng/lttng-ust_2.13.7.bb | |||
@@ -34,7 +34,7 @@ SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \ | |||
34 | file://0001-Makefile.am-update-rpath-link.patch \ | 34 | file://0001-Makefile.am-update-rpath-link.patch \ |
35 | " | 35 | " |
36 | 36 | ||
37 | SRC_URI[sha256sum] = "e7e04596dd73ac7aa99e27cd000f949dbb0fed51bd29099f9b08a25c1df0ced5" | 37 | SRC_URI[sha256sum] = "5fb4f17c307c8c1b79c68561e89be9562d07e7425bf40e728c4d66755342a5eb" |
38 | 38 | ||
39 | CVE_PRODUCT = "ust" | 39 | CVE_PRODUCT = "ust" |
40 | 40 | ||