aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2024-05-06 11:28:22 +0000
committerSamuli Piippo <samuli.piippo@qt.io>2024-05-07 16:49:39 +0000
commita4e4591a60e355d592d4ab5b6eecb55c85d7a756 (patch)
tree168cf0d96de30edbc061c77e9a1fa6330382e269
parentf9232b52c6ff42f665d1b020e073ca2d36ae18dd (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 Pick-to: nanbield kirkstone Change-Id: I13ee0e8b6726d5f23cdbf88425afae5730a1cffb Reviewed-by: Ari Parkkila <ari.parkkila@qt.io> Reviewed-by: Alex Bu <alex.bu@qt.io>
-rw-r--r--meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-appcontroller_git.bb1
-rw-r--r--meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-demolauncher_git.bb1
-rw-r--r--meta-boot2qt/recipes-qt/boot2qt-addons/boot2qt-startupscreen_git.bb1
-rw-r--r--meta-boot2qt/recipes-qt/boot2qt-addons/qdb_git.bb1
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 e8d2016b..674a1556 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 \