diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2024-05-06 11:28:22 +0000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-05-07 17:43:50 +0000 |
| commit | 4b3f4657243181c789637b77c60d2cfa1b3b7656 (patch) | |
| tree | 28810c922295378fbd344567f9658433303d582f | |
| parent | 24f7575b6131862bb005c2e6dee493f4b5a68bc7 (diff) | |
Use correct CVE_PRODUCT
By inheriting qt6-git.inc, these recipes had 'qt' entry in the SPDX license
data. These are not part of the Qt product, so be explicit about it.
Fixes: QTBUG-125018
Change-Id: I13ee0e8b6726d5f23cdbf88425afae5730a1cffb
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
Reviewed-by: Alex Bu <alex.bu@qt.io>
(cherry picked from commit a4e4591a60e355d592d4ab5b6eecb55c85d7a756)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
4 files changed, 4 insertions, 0 deletions
diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb index f0c2cbeb..2b6c9bad 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb @@ -36,6 +36,7 @@ require recipes-qt/qt6/qt6-git.inc QT_GIT_PROJECT = "qt-apps" QT_MODULE_BRANCH = "dev" +CVE_PRODUCT = "${BPN}" SRCREV = "3e0ecc85628f17e4d7929f3341aa76b376b8080e" diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demolauncher_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demolauncher_git.bb index 9a82fda5..27892b25 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demolauncher_git.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demolauncher_git.bb @@ -42,6 +42,7 @@ QT_GIT_PROTOCOL = "http" QT_GIT_PROJECT = "qt-apps" QT_MODULE = "boot2qt-launcher" QT_MODULE_BRANCH = "dev" +CVE_PRODUCT = "${BPN}" SRC_URI += " \ ${QT_GIT}/qt-apps/boot2qt-demos.git;name=metadata;branch=dev;protocol=${QT_GIT_PROTOCOL};destsuffix=git/metadata \ diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-startupscreen_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-startupscreen_git.bb index fa002023..a574adf0 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-startupscreen_git.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-startupscreen_git.bb @@ -39,6 +39,7 @@ QT_GIT_PROTOCOL = "http" QT_GIT_PROJECT = "qt-apps" QT_MODULE = "boot2qt-demos" QT_MODULE_BRANCH = "dev" +CVE_PRODUCT = "${BPN}" SRC_URI += "\ file://startupscreen.service \ diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb index 23f19ccd..d80c2666 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb @@ -38,6 +38,7 @@ require recipes-qt/qt6/qt6-git.inc QT_GIT_PROJECT = "qt-apps" QT_MODULE_BRANCH = "master" +CVE_PRODUCT = "${BPN}" SRC_URI += "\ file://b2qt-gadget-network.sh \ |