From 7e61e6265bcd9e721ef1791327a614f48850fbd3 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 26 Sep 2019 18:09:12 +0800 Subject: 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 Signed-off-by: Robert Yang --- ...gust-Makefile.am-Add-install-lib-to-setup.patch | 31 ++++++++++++++++++++++ meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch 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..c2028d0e1a --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch @@ -0,0 +1,31 @@ +From f79dac30af9adda12996da7f6aa6667d3b580537 Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Thu, 26 Sep 2019 17:54:00 +0800 +Subject: [PATCH] python-lttngust/Makefile.am: Add --install-lib to setup.py + +Otherwise it may install to /usr/lib, but should be /usr/lib64 when cross +building. + +Upstream-Status: Submitted [https://github.com/lttng/lttng-ust/pull/59] + +Signed-off-by: Robert Yang +--- + python-lttngust/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/python-lttngust/Makefile.am b/python-lttngust/Makefile.am +index 6c0d20d..38b51b8 100644 +--- a/python-lttngust/Makefile.am ++++ b/python-lttngust/Makefile.am +@@ -9,7 +9,7 @@ install-exec-local: + if [ "$(DESTDIR)" != "" ]; then \ + opts="$$opts --root=$(DESTDIR)"; \ + fi; \ +- $(PYTHON) setup.py install $$opts; ++ $(PYTHON) setup.py install $$opts --install-lib=$(pythondir); + + clean-local: + rm -rf $(builddir)/build +-- +2.7.4 + 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" SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \ file://lttng-ust-doc-examples-disable.patch \ + file://0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch \ " SRC_URI[md5sum] = "f0c86a9fa7dcfd0205fb42584a310b1c" -- cgit 1.2.3-korg