diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-10-11 11:40:35 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-13 09:41:39 +0100 |
commit | 6d3f55ea8f7190e6825dc72424088658cbc0a13c (patch) | |
tree | 09deef8ad390ac5213aee3e7bf3334cdb91ea7f6 /meta | |
parent | 1189f95e05c80286e009e1ab46a603ee5b7ca239 (diff) | |
download | openembedded-core-contrib-6d3f55ea8f7190e6825dc72424088658cbc0a13c.tar.gz |
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>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu-system-native_6.1.0.bb | 2 |
2 files changed, 2 insertions, 2 deletions
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 } |