From 2457cf6d9e8e45bfd7753996c817c7c6cd45c149 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 9 Feb 2022 14:54:52 +0200 Subject: Fix a bug in LA 4.4 Fixes: QTPMO-1479 Change-Id: Iafb54220028d864ce127f48ea74cfcec9ac843f2 Reviewed-by: Samuli Piippo (cherry picked from commit 885c4ac2237bb0f1a80b038c8e6e32bf14ee7b7a) Reviewed-by: Qt Cherry-pick Bot --- .../intel/recipes-core/microcode-initramfs/microcode-initramfs.bb | 2 +- meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt6-image.bb | 2 +- meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb | 2 +- meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb | 2 +- .../recipes-qt/meta/meta-toolchain-b2qt-embedded-qt6-sdk.bb | 2 +- meta-boot2qt/licenses/The-Qt-Company-Commercial | 2 +- meta-boot2qt/recipes-qt/boot2qt-addons/qbsp-readme.bb | 2 +- meta-boot2qt/recipes-qt/qt6/installer-framework-native_4.1.0.bb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meta-boot2qt-distro/dynamic-layers/intel/recipes-core/microcode-initramfs/microcode-initramfs.bb b/meta-boot2qt-distro/dynamic-layers/intel/recipes-core/microcode-initramfs/microcode-initramfs.bb index 25b63ee5..b264b156 100644 --- a/meta-boot2qt-distro/dynamic-layers/intel/recipes-core/microcode-initramfs/microcode-initramfs.bb +++ b/meta-boot2qt-distro/dynamic-layers/intel/recipes-core/microcode-initramfs/microcode-initramfs.bb @@ -29,7 +29,7 @@ SUMMARY = "Initramfs with early load intel microcode" LICENSE = "The-Qt-Company-Commercial" -LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=39d870f757f85e8752ec4afdad1e4e1d" +LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=71469b4021772fca0f18e08b1ef8ac7e" inherit deploy nopackages diff --git a/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt6-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt6-image.bb index 4b41f041..acce628d 100644 --- a/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt6-image.bb +++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-embedded-qt6-image.bb @@ -29,7 +29,7 @@ SUMMARY = "Qt for Device Creation Demo Image" LICENSE = "The-Qt-Company-Commercial" -LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=39d870f757f85e8752ec4afdad1e4e1d" +LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=71469b4021772fca0f18e08b1ef8ac7e" DEPLOY_CONF_TYPE = "Boot2Qt $QT_VERSION" diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb index eccfdadc..2e55807e 100644 --- a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb +++ b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-embedded-qbsp.bb @@ -30,7 +30,7 @@ DESCRIPTION = "Meta task for QBSP creation" LICENSE = "The-Qt-Company-Commercial" -LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=39d870f757f85e8752ec4afdad1e4e1d" +LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=71469b4021772fca0f18e08b1ef8ac7e" # get Qt version number require recipes-qt/qt6/qt6-git.inc diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb index 03bda326..05ed0186 100644 --- a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb +++ b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-ci-sdk.bb @@ -30,7 +30,7 @@ DESCRIPTION = "Qt6 SDK toolchain for CI use" LICENSE = "The-Qt-Company-Commercial" -LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=39d870f757f85e8752ec4afdad1e4e1d" +LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=71469b4021772fca0f18e08b1ef8ac7e" inherit populate_sdk diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt6-sdk.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt6-sdk.bb index ed6f844c..0ed681be 100644 --- a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt6-sdk.bb +++ b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt6-sdk.bb @@ -30,7 +30,7 @@ DESCRIPTION = "B2Qt embedded Qt6 SDK toolchain" LICENSE = "The-Qt-Company-Commercial" -LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=39d870f757f85e8752ec4afdad1e4e1d" +LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=71469b4021772fca0f18e08b1ef8ac7e" inherit populate_b2qt_qt6_sdk diff --git a/meta-boot2qt/licenses/The-Qt-Company-Commercial b/meta-boot2qt/licenses/The-Qt-Company-Commercial index 436daf05..7487df85 100644 --- a/meta-boot2qt/licenses/The-Qt-Company-Commercial +++ b/meta-boot2qt/licenses/The-Qt-Company-Commercial @@ -1258,7 +1258,7 @@ only ("Redistributables") are marked with "R" in the below table. +----------------------------------------------------------+ | Qt Quick Ultralite | | | X,R | X,R | +----------------------------------------------------------+ -| Qt Safe Renderer (QSR) | | | X,R | X,R | +| Qt Safe Renderer (QSR) | | | | X,R | +----------------------------------------------------------+ | Qt Application Manager | | | | X,R | +----------------------------------------------------------+ diff --git a/meta-boot2qt/recipes-qt/boot2qt-addons/qbsp-readme.bb b/meta-boot2qt/recipes-qt/boot2qt-addons/qbsp-readme.bb index 378d907b..0f5cf8fb 100644 --- a/meta-boot2qt/recipes-qt/boot2qt-addons/qbsp-readme.bb +++ b/meta-boot2qt/recipes-qt/boot2qt-addons/qbsp-readme.bb @@ -29,7 +29,7 @@ SUMMARY = "Device specific installation instructions for the QBSP" LICENSE = "The-Qt-Company-Commercial" -LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=39d870f757f85e8752ec4afdad1e4e1d" +LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=71469b4021772fca0f18e08b1ef8ac7e" inherit deploy nopackages diff --git a/meta-boot2qt/recipes-qt/qt6/installer-framework-native_4.1.0.bb b/meta-boot2qt/recipes-qt/qt6/installer-framework-native_4.1.0.bb index 8980f27e..994b72a1 100644 --- a/meta-boot2qt/recipes-qt/qt6/installer-framework-native_4.1.0.bb +++ b/meta-boot2qt/recipes-qt/qt6/installer-framework-native_4.1.0.bb @@ -29,7 +29,7 @@ DESCRIPTION = "Qt Installer Framework" LICENSE = "The-Qt-Company-Commercial" -LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=39d870f757f85e8752ec4afdad1e4e1d" +LIC_FILES_CHKSUM = "file://${BOOT2QTBASE}/licenses/The-Qt-Company-Commercial;md5=71469b4021772fca0f18e08b1ef8ac7e" inherit bin_package native -- cgit v1.2.3