All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex@linutronix.de>
Subject: [PATCH 01/25] qemu: install qmp module without hardcoding the python version in oeqa scripts
Date: Mon, 11 Oct 2021 11:40:35 +0200	[thread overview]
Message-ID: <20211011094059.4184654-1-alex@linutronix.de> (raw)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/lib/oeqa/utils/qemurunner.py                      | 2 +-
 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 d961a9a2183..03971480825 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 b47ffd52627..b544ab4e817 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
 }
-- 
2.20.1



             reply	other threads:[~2021-10-11  9:41 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-11  9:40 Alexander Kanavin [this message]
2021-10-11  9:40 ` [PATCH 02/25] lttng-tools: replace ad hoc ptest fixup with upstream fixes Alexander Kanavin
2021-10-11  9:40 ` [PATCH 03/25] rt-tests: update 2.1 -> 2.2 Alexander Kanavin
2021-10-11  9:40 ` [PATCH 04/25] libgit2: update 1.1.1 -> 1.2.0 Alexander Kanavin
2021-10-11  9:40 ` [PATCH 05/25] libssh2: update 1.9.0 -> 1.10.0 Alexander Kanavin
2021-10-11 16:06   ` Khem Raj
2021-10-11  9:40 ` [PATCH 06/25] python3: update 3.9.6 -> 3.10.0 Alexander Kanavin
2021-10-11  9:40 ` [PATCH 07/25] openssl: update 1.1.1l -> 3.0.0 Alexander Kanavin
2021-10-11 18:07   ` [OE-core] " Peter Kjellerstedt
2021-10-12 11:02     ` Alexander Kanavin
2021-10-11  9:40 ` [PATCH 08/25] cryptodev-tests: do not use -Werror with openssl 3 Alexander Kanavin
2021-10-11  9:40 ` [PATCH 09/25] serf: add a openssl 3 compatibility fix Alexander Kanavin
2021-10-11  9:40 ` [PATCH 10/25] ruby: disable openssl extension Alexander Kanavin
2021-10-11  9:40 ` [PATCH 11/25] glib-2.0: update 2.68.4 -> 2.70.0 Alexander Kanavin
2021-10-11  9:40 ` [PATCH 12/25] glib-networking: update 2.68.2 " Alexander Kanavin
2021-10-11  9:40 ` [PATCH 13/25] bison: update 3.7.6 -> 3.8.1 Alexander Kanavin
2021-10-11  9:40 ` [PATCH 14/25] libdnf: update 0.63.1 -> 0.64.0 Alexander Kanavin
2021-10-11  9:40 ` [PATCH 15/25] libexif: update 0.6.22 -> 0.6.23 Alexander Kanavin
2021-10-11  9:40 ` [PATCH 16/25] sudo: update 1.9.7p2 -> 1.9.8p1 Alexander Kanavin
2021-10-11  9:40 ` [PATCH 17/25] wget: update 1.21.1 -> 1.21.2 Alexander Kanavin
2021-10-11  9:40 ` [PATCH 18/25] coreutils: update 8.32 -> 9.0 Alexander Kanavin
2021-10-11  9:40 ` [PATCH 19/25] itstool: update 2.0.6 -> 2.0.7 Alexander Kanavin
2021-10-11  9:40 ` [PATCH 20/25] nghttp2: add recipe from meta-oe Alexander Kanavin
2021-10-11  9:40 ` [PATCH 21/25] libsoup: add a 3.x recipe Alexander Kanavin
2021-10-12 10:08   ` [OE-core] " Ross Burton
2021-10-12 10:45     ` Alexander Kanavin
2021-10-11  9:40 ` [PATCH 22/25] webkitgtk: trim down DEPENDS Alexander Kanavin
2021-10-11  9:40 ` [PATCH 23/25] epiphany: " Alexander Kanavin
2021-10-11  9:40 ` [PATCH 24/25] webkitgtk: update 2.32.3 -> 2.34.0 Alexander Kanavin
2021-10-11 16:08   ` Khem Raj
2021-10-26 19:38   ` [OE-core] " Martin Jansa
2021-10-26 20:07     ` Alexander Kanavin
2021-10-26 20:40       ` Martin Jansa
2021-10-26 21:35         ` Alexander Kanavin
2021-10-26 21:51           ` Martin Jansa
2021-10-26 21:59             ` Alexander Kanavin
     [not found]     ` <16B1AD7283CD4D45.19566@lists.openembedded.org>
2021-10-26 20:21       ` Alexander Kanavin
2021-10-11  9:40 ` [PATCH 25/25] epiphany: update 40.3 -> 41.0 Alexander Kanavin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211011094059.4184654-1-alex@linutronix.de \
    --to=alex.kanavin@gmail.com \
    --cc=alex@linutronix.de \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.