diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2024-03-20 16:09:40 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2024-03-21 09:32:44 +0200 |
| commit | 23da7b40d7fc3d7dc652fe2ed1b67194d8c9a188 (patch) | |
| tree | 5e4444637c8e8b79dd70080835644076d232fb46 | |
| parent | dd4f7b77dae76f0564d0c1d3342897577060aee8 (diff) | |
| parent | b8e1ae8ce6140f6084388842751280b55d55988b (diff) | |
Merge remote-tracking branch 'qt/upstream/master' into lts-5.15
* Scarthcap update required for CI (also for meta-python2 in module_config.yaml)
* qtbase CVE fix patches ingored as they're already merged.
changelog:
b8e1ae8c layer.conf: Update for the scarthgap release series
65a8be4d qtbase: Pick CVE-2023-51714 fix
Conflicts:
recipes-qt/qt5/qtbase_git.bb
Change-Id: I872cad921a554f5398fb3bd4ffe58a4be81eaf62
| -rw-r--r-- | coin/module_config.yaml | 2 | ||||
| -rw-r--r-- | conf/layer.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 2d1137c6..8ae9c795 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -127,7 +127,7 @@ instructions: source ./poky/oe-init-build-env # meta-python2 layer master branch compatible with kirkstone only - echo "LAYERSERIES_COMPAT_meta-python2:append = \" langdale mickledore nanbield\"" >> ../meta-python2/conf/layer.conf + echo "LAYERSERIES_COMPAT_meta-python2:append = \" langdale mickledore nanbield scarthgap\"" >> ../meta-python2/conf/layer.conf bitbake-layers add-layer ../meta-openembedded/meta-oe bitbake-layers add-layer ../meta-python2 diff --git a/conf/layer.conf b/conf/layer.conf index 4f5dde5c..5e6a2432 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -29,7 +29,7 @@ LAYERVERSION_qt5-layer = "1" LAYERDEPENDS_qt5-layer = "core openembedded-layer" -LAYERSERIES_COMPAT_qt5-layer = "dunfell gatesgarth hardknott honister kirkstone langdale mickledore nanbield" +LAYERSERIES_COMPAT_qt5-layer = "dunfell gatesgarth hardknott honister kirkstone langdale mickledore nanbield scarthgap" LICENSE_PATH += "${LAYERDIR}/licenses" |