From 83e72b4c8ef5801ebc4096b85f44888a306ba264 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 6 Sep 2017 16:32:21 +0300 Subject: qtivi: update revision Patch needed to get correct QT_HOST_BINS path during build. Change-Id: Ic61b49ead57d7141bc540283ddbdb7ea36aa9ccd Reviewed-by: Dominik Holland --- ...QT_HOST_BINS-get-for-getting-correct-path.patch | 29 ++++++++++++++++++++++ recipes-qt/automotive/qtivi_git.bb | 5 ++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 recipes-qt/automotive/qtivi/0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch diff --git a/recipes-qt/automotive/qtivi/0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch b/recipes-qt/automotive/qtivi/0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch new file mode 100644 index 0000000..9f6c0c0 --- /dev/null +++ b/recipes-qt/automotive/qtivi/0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch @@ -0,0 +1,29 @@ +From b4ed8c9d4a391771cba485bfa685147126260dc2 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Thu, 7 Sep 2017 10:24:11 +0300 +Subject: [PATCH] Use QT_HOST_BINS/get for getting correct path + +Patch QT_HOST_BINS same way as is done it qtbase for getting +the EffectivePath instead of installation path. + +Change-Id: I3e9c04019c432e182dcb5c0898275173f20de1e2 +--- + mkspecs/features/ivigenerator.prf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mkspecs/features/ivigenerator.prf b/mkspecs/features/ivigenerator.prf +index 65c497e..7634355 100644 +--- a/mkspecs/features/ivigenerator.prf ++++ b/mkspecs/features/ivigenerator.prf +@@ -31,9 +31,9 @@ QFACE_YAML = $$QFACE_ABS_PWD/$${QFACE_BASE_NAME}.yaml + OTHER_FILES += $$QFACE_FILE + + # Detect whether we are using the feature inside the qtivi repository +-VIRTUALENV_PATH = $$[QT_HOST_BINS]/ivigenerator/qtivi_qface_virtualenv ++VIRTUALENV_PATH = $$[QT_HOST_BINS/get]/ivigenerator/qtivi_qface_virtualenv + INTERNAL_VIRTUALENV_PATH = $$QTIVI_BUILD_ROOT/src/tools/ivigenerator/qtivi_qface_virtualenv +-IVI_GENERATOR_PATH = $$[QT_HOST_BINS]/ivigenerator ++IVI_GENERATOR_PATH = $$[QT_HOST_BINS/get]/ivigenerator + QTEST_ENVIRONMENT = $$upper($$(QTEST_ENVIRONMENT)) + + # Try to use the internal virtualenv when building qtivi diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb index 0f49d5d..2a6f765 100644 --- a/recipes-qt/automotive/qtivi_git.bb +++ b/recipes-qt/automotive/qtivi_git.bb @@ -47,10 +47,11 @@ QT_MODULE_BRANCH_QFACE = "upstream/develop" SRC_URI += " \ ${QT_GIT}/qtivi-qface.git;name=qface;branch=${QT_MODULE_BRANCH_QFACE};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/qface \ + file://0001-Use-QT_HOST_BINS-get-for-getting-correct-path.patch \ " -SRCREV_qtivi = "3205b6e8f57273096ae60d8f6fcdbe597c350393" -SRCREV_qface = "b1d96d85a7c43ac74335b9a1a99a68507047f5bc" +SRCREV_qtivi = "b8aa8e65981071555a52c6861cec9a05bb8bfaf4" +SRCREV_qface = "e2fd9cd6ff915378779c3f604736b8b4a2584d0b" SRCREV = "${SRCREV_qtivi}" SRCREV_FORMAT = "qtivi_qface" -- cgit v1.2.3-54-g00ecf