summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2019-09-27 19:09:17 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-30 16:55:21 +0100
commit3d7f4b8cbf2807b81b7371a7de9ee145d46812f3 (patch)
treeb1e7d4c4511e115c996cc17e9b0e06b8b39e326b /meta/recipes-kernel
parent9a07399607218a56c9c8ea6fdbfc638b7b37458e (diff)
downloadpoky-3d7f4b8cbf2807b81b7371a7de9ee145d46812f3.tar.gz
lttng-ust: Fix for --enable-python-agent
Fixed: PACKAGECONFIG_append_pn-lttng-ust = ' python3-agent' require conf/multilib.conf MULTILIBS = "multilib:lib32" DEFAULTTUNE_virtclass-multilib-lib32 = "x86" $ bitbake lttng-ust ERROR: lttng-ust-2_2.10.4-r0 do_package: QA Issue: lttng-ust: Files/directories were installed but not shipped in any package: /usr/lib /usr/lib/python3.7 /usr/lib/python3.7/site-packages /usr/lib/python3.7/site-packages/lttngust-2.10.4-py3.7.egg-info (From OE-Core rev: d1b1bfece08ae32c120844d73aadee96de7bbf9b) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch31
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb1
2 files changed, 32 insertions, 0 deletions
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
new file mode 100644
index 0000000000..55679f1b49
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch
@@ -0,0 +1,31 @@
1From f79dac30af9adda12996da7f6aa6667d3b580537 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 26 Sep 2019 17:54:00 +0800
4Subject: [PATCH] python-lttngust/Makefile.am: Add --install-lib to setup.py
5
6Otherwise it may install to /usr/lib, but should be /usr/lib64 when cross
7building.
8
9Upstream-Status: Pending
10
11Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
12---
13 python-lttngust/Makefile.am | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/python-lttngust/Makefile.am b/python-lttngust/Makefile.am
17index 6c0d20d..38b51b8 100644
18--- a/python-lttngust/Makefile.am
19+++ b/python-lttngust/Makefile.am
20@@ -9,7 +9,7 @@ install-exec-local:
21 if [ "$(DESTDIR)" != "" ]; then \
22 opts="$$opts --root=$(DESTDIR)"; \
23 fi; \
24- $(PYTHON) setup.py install $$opts;
25+ $(PYTHON) setup.py install $$opts --install-lib=$(pythondir);
26
27 clean-local:
28 rm -rf $(builddir)/build
29--
302.7.4
31
diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb b/meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb
index e8312afb26..cfaad30b69 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb
@@ -27,6 +27,7 @@ PE = "2"
27 27
28SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \ 28SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \
29 file://lttng-ust-doc-examples-disable.patch \ 29 file://lttng-ust-doc-examples-disable.patch \
30 file://0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch \
30 " 31 "
31 32
32SRC_URI[md5sum] = "f0c86a9fa7dcfd0205fb42584a310b1c" 33SRC_URI[md5sum] = "f0c86a9fa7dcfd0205fb42584a310b1c"