From 8231b9fd82e6425f3380c768f056b9a676d7bc9d Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Mon, 23 Jun 2025 07:07:32 +0000
Subject: [PATCH] Update recipes to match S/UNPACKDIR changes in
 oe-core/whinlatter

In whinlatter, git sources are placed by default to UNPACKDIR/BP and
default value for S now works for git projects. Remove settings of S
and use BB_GIT_DEFAULT_DESTSUFFIX in recipes with multiple git repos.

To support previous Yocto versions, set default value for
BB_GIT_DEFAULT_DESTSUFFIX that matches the default S and use it for
all git checkouts.

Pick-to: 6.8
Change-Id: I49d7ab7e2d34695618a48bf5f649341a8de2cbda
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 8553e4019a4c7932bea530593ef85ad6b99f9c54)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 6dcfaaa359b719d9886b031a38e252ac9b6f0942)
---
 recipes-python/pyside6/python3-pyside6.inc | 2 --
 recipes-qt/qt6/qt3d_git.bb                 | 2 +-
 recipes-qt/qt6/qt6-git.inc                 | 7 ++++---
 recipes-qt/qt6/qtquick3d_git.bb            | 2 +-
 recipes-qt/qt6/qttools_git.bb              | 4 ++--
 recipes-qt/qt6/qtvirtualkeyboard_git.bb    | 2 +-
 recipes-qt/qt6/qtwebengine.inc             | 2 +-
 7 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/recipes-python/pyside6/python3-pyside6.inc b/recipes-python/pyside6/python3-pyside6.inc
index b8d8c8c..22d6720 100644
--- a/recipes-python/pyside6/python3-pyside6.inc
+++ b/recipes-python/pyside6/python3-pyside6.inc
@@ -24,8 +24,6 @@ QT_MODULE = "pyside-setup"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/pyside6:"
 
-S = "${WORKDIR}/git"
-
 EXTRA_OECMAKE += "\
     -DBUILD_TESTS=FALSE \
     -DQFP_PYTHON_SITE_PACKAGES=${PYTHON_SITEPACKAGES_DIR} \
diff --git a/recipes-qt/qt6/qt3d_git.bb b/recipes-qt/qt6/qt3d_git.bb
index 73b8dd6..444f728 100644
--- a/recipes-qt/qt6/qt3d_git.bb
+++ b/recipes-qt/qt6/qt3d_git.bb
@@ -24,7 +24,7 @@ include recipes-qt/qt6/qt6.inc
 ASSIMP_BRANCH = "qt6_assimp"
 
 SRC_URI += " \
-    ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qt3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \
+    ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qt3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/3rdparty/assimp/src \
 "
 
 # Needed for supporting 64bit off_t
diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc
index a65457f..20537d3 100644
--- a/recipes-qt/qt6/qt6-git.inc
+++ b/recipes-qt/qt6/qt6-git.inc
@@ -8,12 +8,13 @@ QT_MODULE_BRANCH ?= "6.9"
 QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
 QT_MODULE_REPO ?= "${QT_MODULE}.git"
 
-SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE_REPO};name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL}"
+# for compatibility with Yocto releases before whinlatter
+BB_GIT_DEFAULT_DESTSUFFIX ?= "${BP}"
+
+SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE_REPO};name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}"
 
 CVE_PRODUCT ?= "qt:${BPN} qt:qt"
 
-S = "${WORKDIR}/git"
-
 PV = "${QT_VERSION}"
 
 SRCREV = "${SRCREV_${QT_MODULE}}"
diff --git a/recipes-qt/qt6/qtquick3d_git.bb b/recipes-qt/qt6/qtquick3d_git.bb
index 620737d..43450c4 100644
--- a/recipes-qt/qt6/qtquick3d_git.bb
+++ b/recipes-qt/qt6/qtquick3d_git.bb
@@ -22,7 +22,7 @@ include recipes-qt/qt6/qt6.inc
 ASSIMP_BRANCH = "qt6_assimp"
 
 SRC_URI += " \
-    ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qtquick3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \
+    ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qtquick3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/3rdparty/assimp/src \
     file://0001-Skip-embree-on-mingw.patch \
 "
 
diff --git a/recipes-qt/qt6/qttools_git.bb b/recipes-qt/qt6/qttools_git.bb
index c6df934..a8c9b8c 100644
--- a/recipes-qt/qt6/qttools_git.bb
+++ b/recipes-qt/qt6/qttools_git.bb
@@ -18,8 +18,8 @@ include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
 SRC_URI += " \
-    ${QT_GIT}/playground/qlitehtml.git;name=qttools-qlitehtml;branch=master;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/assistant/qlitehtml \
-    git://github.com/litehtml/litehtml.git;name=qttools-qlitehtml-litehtml;branch=master;destsuffix=git/src/assistant/qlitehtml/src/3rdparty/litehtml;protocol=https \
+    ${QT_GIT}/playground/qlitehtml.git;name=qttools-qlitehtml;branch=master;protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/assistant/qlitehtml \
+    git://github.com/litehtml/litehtml.git;name=qttools-qlitehtml-litehtml;branch=master;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/assistant/qlitehtml/src/3rdparty/litehtml;protocol=https \
     file://0002-examples-don-t-track-source-path.patch \
 "
 
diff --git a/recipes-qt/qt6/qtvirtualkeyboard_git.bb b/recipes-qt/qt6/qtvirtualkeyboard_git.bb
index 14dd34e..1629352 100644
--- a/recipes-qt/qt6/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt6/qtvirtualkeyboard_git.bb
@@ -18,7 +18,7 @@ include recipes-qt/qt6/qt6.inc
 # and enable "t9write" in PACKAGECONFIG. This can be done in a separate .bbappend file.
 # for example:
 #T9WRITEPACKAGE = "${HOME}/Downloads/zzEval_QT_T9Write_Alpha_v750_20150916.zip"
-#SRC_URI += "file://${T9WRITEPACKAGE};subdir=git/src/virtualkeyboard/3rdparty/t9write"
+#SRC_URI += "file://${T9WRITEPACKAGE};subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/src/virtualkeyboard/3rdparty/t9write"
 #PACKAGECONFIG = "t9write"
 
 VKB_LANGUAGES ?= "\
diff --git a/recipes-qt/qt6/qtwebengine.inc b/recipes-qt/qt6/qtwebengine.inc
index 31bf74f..fa97a49 100644
--- a/recipes-qt/qt6/qtwebengine.inc
+++ b/recipes-qt/qt6/qtwebengine.inc
@@ -34,7 +34,7 @@ QT_MODULE_BRANCH_CHROMIUM = "130-based"
 FILESEXTRAPATHS:prepend := "${THISDIR}/qtwebengine:"
 
 SRC_URI += " \
-    ${QT_GIT}/${QT_GIT_PROJECT}/qtwebengine-chromium.git;name=qtwebengine-chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
+    ${QT_GIT}/${QT_GIT_PROJECT}/qtwebengine-chromium.git;name=qtwebengine-chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/3rdparty \
     file://0001-CMake-use-generated-yocto-toolchains.patch \
     file://0002-Enable-examples.patch \
 "