Skip to contentSkip to conversation

lttng-ust: Fix for --enable-python-agent

PATCH In review Robert Yang 2 participants 4 messages Sep 27, 2019 – Sep 29, 2019

lore
Share & tools
lore
#0 lore raw

cover lttng-ust: Fix for --enable-python-agent

The following changes since commit 95ad5626296380358c8a502a3e04879dab653d78:

build-appliance-image: Update to master head revision (2019-09-19 20:32:47 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/lttng
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/lttng

Robert Yang (1):
lttng-ust: Fix for --enable-python-agent

 ...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
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 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
---
 ...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
meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch new file +31 -0
new file mode 100644
index 0000000..55679f1
@@ -0,0 +1,31 @@
+From f79dac30af9adda12996da7f6aa6667d3b580537 Mon Sep 17 00:00:00 2001
+From: Robert Yang <[email protected]>
+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: Pending
+
+Signed-off-by: Robert Yang <[email protected]>
+---
+ 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
+
meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb +1 -0
index e8312af..cfaad30 100644
@@ -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"
Signature · 1 line
2.7.4
#2 lore raw
Quoted 1 line · Robert Yang

+Upstream-Status: Pending

Can you send this upstream? It's on GitHub so is just a pull request away.

Ross

#3 lore raw
Quoted 4 lines · Ross Burton
Quoted 1 line · Robert Yang

+Upstream-Status: Pending

Can you send this upstream? It's on GitHub so is just a pull request away.

Thanks, I submitted it just now and updated patch message in the PULL:

Upstream-Status: Submitted [https://github.com/lttng/lttng-ust/pull/59]

// Robert

Quoted 2 lines

Ross