Merge remote-tracking branch 'origin/morty' into pyro

* origin/morty:
  qtivi: export envs for ivigenerator
  meta-qt5: update meta layer

Change-Id: I2b5704706351e2ecd10ca0ea8bfc8f975adfffc1

1 files changed, 8 insertions, 1 deletions

diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb
index 6b364d3..0f49d5d 100644
--- a/recipes-qt/automotive/qtivi_git.bb
+++ b/recipes-qt/automotive/qtivi_git.bb
@@ -68,7 +68,7 @@ PACKAGECONFIG_class-nativesdk ??= "${PACKAGECONFIG_class-native}"
 
 EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS} ${@bb.utils.contains_any('PACKAGECONFIG', 'ivigenerator ivigenerator-native', '', 'QMAKE_EXTRA_ARGS+=-no-ivigenerator', d)}"
 
-do_compile_prepend() {
+set_python_paths() {
     # Otherwise pip might cache or reuse something from our home folder
     export HOME="${STAGING_DATADIR_NATIVE}"
     # This is needed as otherwise the virtualenv tries to use the libs from the host
@@ -76,6 +76,13 @@ do_compile_prepend() {
     # Let qtivi use the python3-native binaries
     export PYTHON3_PATH="${STAGING_BINDIR_NATIVE}/python3-native"
 }
+do_compile_prepend() {
+    set_python_paths
+}
+do_install_prepend() {
+    set_python_paths
+}
+
 
 BBCLASSEXTEND += "native nativesdk"