From b06c0b1d690142524b74ed75e0a8c97c4722f263 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 15 Aug 2023 07:10:52 +0000
Subject: [PATCH] Drop support for older Yocto releases
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Kirkstone will be the oldests Yocto release supported by Qt 6.7.
Qt 6.7 will be released in spring 2024, at which point Dunfell
will be EOL.

Change-Id: I8fee78d4d75401a502762e4b28987a07bfdd1af4
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Tommi Mänttäri <tommi.manttari@qt.io>
---
 README.md               | 8 ++++----
 coin/module_config.yaml | 6 +++---
 coin/test-dunfell.inc   | 1 -
 conf/layer.conf         | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)
 delete mode 100644 coin/test-dunfell.inc

diff --git a/README.md b/README.md
index 65c1554..557e058 100644
--- a/README.md
+++ b/README.md
@@ -28,10 +28,10 @@ the LAYERSERIES_COMPAT (c).
 | mickledore |  x  |  x  |  x  |  x  |     |     |
 | langdale   |  x  |  x  |  x  |  x  |     |     |
 | kirkstone  |  x  |  x  |  x  |  x  |  x  |  x  |
-| honister   |  c  |  c  |  c  |  c  |  x  |  x  |
-| hardknott  |  c  |  c  |  c  |  c  |  c  |  c  |
-| gatesgarth |  c  |  c  |  c  |  c  |  c  |  c  |
-| dunfell    |  x  |  x  |  x  |  x  |  x  |  x  |
+| honister   |     |  c  |  c  |  c  |  x  |  x  |
+| hardknott  |     |  c  |  c  |  c  |  c  |  c  |
+| gatesgarth |     |  c  |  c  |  c  |  c  |  c  |
+| dunfell    |     |  x  |  x  |  x  |  x  |  x  |
 
 Commercial Qt
 -------------
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index 2456205..31e8350 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -17,7 +17,7 @@ machine_type:
 #
 #           [target1]       [target2]   [target3]       [target4]       [target5]
 # [machine] qemuarm64       qemux86     qemuarm         qemux86-64      qemuarm64
-# [yocto]   kirkstone       langdale    mickledore      dunfell         master
+# [yocto]   kirkstone       langdale    mickledore      master          master
 # [X11]     no              no          yes             yes             no
 # [mingw]   no              yes         no              no              no
 # [static]  no              no          no              no              yes
@@ -79,10 +79,10 @@ target4: &target4
       variableValue: qemux86-64
     - type: EnvironmentVariable
       variableName: MANIFEST
-      variableValue: dunfell.xml
+      variableValue: master.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs dunfell no-webengine
+      variableValue: ci configs
   enable_if:
       condition: property
       property: target.arch
diff --git a/coin/test-dunfell.inc b/coin/test-dunfell.inc
deleted file mode 100644
index efc9238..0000000
--- a/coin/test-dunfell.inc
+++ /dev/null
@@ -1 +0,0 @@
-LICENSE_FLAGS_WHITELIST = "commercial_ffmpeg commercial_x264"
diff --git a/conf/layer.conf b/conf/layer.conf
index 59e5065..54859c7 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -36,7 +36,7 @@ LAYERVERSION_qt6-layer = "1"
 
 LAYERDEPENDS_qt6-layer = "core"
 
-LAYERSERIES_COMPAT_qt6-layer = "dunfell gatesgarth hardknott honister kirkstone langdale mickledore"
+LAYERSERIES_COMPAT_qt6-layer = "kirkstone langdale mickledore"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"