CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update recipes to match S/UNPACKDIR changes in oe-core/whinlatter

Browse Source 
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 8553e4019a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 6dcfaaa359)
This commit is contained in:
Samuli Piippo 2025-06-23 07:07:32 +00:00
parent 5f09943063
commit 8231b9fd82
7 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes-python/pyside6/python3-pyside6.inc
View File

@ -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} \

2
recipes-qt/qt6/qt3d_git.bb
View File

@ -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

7
recipes-qt/qt6/qt6-git.inc
View File

@ -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}}"

2
recipes-qt/qt6/qtquick3d_git.bb
View File

@ -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 \
"

4
recipes-qt/qt6/qttools_git.bb
View File

@ -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 \
"

2
recipes-qt/qt6/qtvirtualkeyboard_git.bb
View File

@ -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 ?= "\

2
recipes-qt/qt6/qtwebengine.inc
View File

@ -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 \
"