From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 11 Oct 2021 09:40:35 +0000 (+0200)
Subject: qemu: install qmp module without hardcoding the python version in oeqa scripts
X-Git-Tag: uninative-3.5~1298
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=6d3f55ea8f7190e6825dc72424088658cbc0a13c;p=openembedded-core.git

qemu: install qmp module without hardcoding the python version in oeqa scripts

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index d961a9a218..0397148082 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -183,7 +183,7 @@ class QemuRunner:
         # then add in the site-packages path components and add that
         # to the python sys.path so qmp.py can be found.
         python_path = os.path.dirname(os.path.dirname(self.logfile))
-        python_path += "/recipe-sysroot-native/usr/lib/python3.9/site-packages"
+        python_path += "/recipe-sysroot-native/usr/lib/qemu-python"
         sys.path.append(python_path)
         importlib.invalidate_caches()
         try:
diff --git a/meta/recipes-devtools/qemu/qemu-system-native_6.1.0.bb b/meta/recipes-devtools/qemu/qemu-system-native_6.1.0.bb
index b47ffd5262..b544ab4e81 100644
--- a/meta/recipes-devtools/qemu/qemu-system-native_6.1.0.bb
+++ b/meta/recipes-devtools/qemu/qemu-system-native_6.1.0.bb
@@ -28,5 +28,5 @@ do_install:append() {
     rm -rf ${D}${includedir}/qemu-plugin.h
 
     # Install qmp.py to be used with testimage
-    install -D ${S}/python/qemu/qmp/__init__.py ${D}${PYTHON_SITEPACKAGES_DIR}/qmp.py
+    install -D ${S}/python/qemu/qmp/__init__.py ${D}${libdir}/qemu-python/qmp.py
 }