From e7addcb2a85b0cdd50a4c2ed6583511d7f0d4555 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen.kooi@oss.qualcomm.com>
Date: Mon, 3 Mar 2025 10:10:37 +0100
Subject: [PATCH 1/3] ci/distro.yml: enable meta-xfce and its dependencies

The enables meta-xfce and friends for DISTRO='qcom-wayland'

Signed-off-by: Koen Kooi <koen.kooi@oss.qualcomm.com>
---
 ci/distro.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ci/distro.yml b/ci/distro.yml
index 5d63538d4..7e90da136 100644
--- a/ci/distro.yml
+++ b/ci/distro.yml
@@ -9,3 +9,13 @@ repos:
   meta-qcom-distro:
     url: https://github.com/qualcomm-linux/meta-qcom-distro
     branch: main
+
+  meta-openembedded:
+    url: https://github.com/openembedded/meta-openembedded
+    layers:
+      meta-oe:
+      meta-xfce:
+      meta-gnome:
+      meta-python:
+      meta-networking:
+      meta-multimedia: 

From 6ae53e37e3efaaffcffe76acef0e70502a8365e3 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen.kooi@oss.qualcomm.com>
Date: Mon, 24 Mar 2025 10:11:59 +0100
Subject: [PATCH 2/3] github workflow: build both Poky and Qcom DISTRO configs

Add another axis to the CI matrix: distro.name and have a companion
variable to add optional extra yaml files. The DISTRO in
meta-qcom-distro needs `distro.yml`, while the default
Poky-that-isn't-poky-anymore does not need an extra yaml.

Signed-off-by: Koen Kooi <koen.kooi@oss.qualcomm.com>
---
 .github/workflows/build-yocto.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-yocto.yml b/.github/workflows/build-yocto.yml
index 9b2ff91bb..35db29310 100644
--- a/.github/workflows/build-yocto.yml
+++ b/.github/workflows/build-yocto.yml
@@ -92,8 +92,13 @@ jobs:
           - qrb2210-rb1-core-kit
           - qcom-armv8a
           - qcom-armv7a
+        distro:
+          - name: poky/systemd
+            yamlfile: ""
+          - name: qcom
+            yamlfile: 'ci/distro.yml:'
     runs-on: [self-hosted, x86]
-    name: ${{ matrix.machine }}/poky/systemd
+    name: ${{ matrix.machine }}/${{ matrix.distro.name }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -110,7 +115,7 @@ jobs:
           export SSTATE_DIR=${CACHE_DIR}/sstate-cache
           export KAS_WORK_DIR=$PWD/../kas
           mkdir $KAS_WORK_DIR
-          kas build ci/mirror.yml:ci/${{ matrix.machine }}.yml
+          kas build ci/mirror.yml:${{ matrix.distro.yamlfile }}ci/${{ matrix.machine }}.yml
           ci/yocto-pybootchartgui.sh && mv $KAS_WORK_DIR/build/buildchart.svg .
 
       - uses: actions/upload-artifact@v4

From 9266c4ce2b3796a3f49de8b114a703ccf5f2d5b8 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen.kooi@oss.qualcomm.com>
Date: Wed, 9 Apr 2025 15:57:45 +0200
Subject: [PATCH 3/3] ci: split local.conf mods out from base.yml

These are specific to un-breaking Poky and nodistro, no need to force them onto other
DISTROs.

Update github workflows to use the new yml as well.

Signed-off-by: Koen Kooi <koen.kooi@oss.qualcomm.com>
---
 .github/workflows/build-yocto.yml |  2 +-
 ci/base.yml                       |  8 --------
 ci/localconfmods.yml              | 15 +++++++++++++++
 3 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 ci/localconfmods.yml

diff --git a/.github/workflows/build-yocto.yml b/.github/workflows/build-yocto.yml
index 35db29310..d2ba69b43 100644
--- a/.github/workflows/build-yocto.yml
+++ b/.github/workflows/build-yocto.yml
@@ -94,7 +94,7 @@ jobs:
           - qcom-armv7a
         distro:
           - name: poky/systemd
-            yamlfile: ""
+            yamlfile: 'ci/localconfmods.yml:'
           - name: qcom
             yamlfile: 'ci/distro.yml:'
     runs-on: [self-hosted, x86]
diff --git a/ci/base.yml b/ci/base.yml
index 329c80325..ecc6f40a4 100644
--- a/ci/base.yml
+++ b/ci/base.yml
@@ -28,18 +28,10 @@ repos:
       meta-poky:
 
 local_conf_header:
-  base: |
-    CONF_VERSION = "2"
-    INIT_MANAGER = "systemd"
-    PACKAGE_CLASSES = "package_ipk"
-    INHERIT += "buildstats buildstats-summary"
-    INHERIT += "buildhistory"
-    INHERIT += "rm_work"
   qcomflash: |
     IMAGE_CLASSES += "image_types_qcom"
     IMAGE_FSTYPES += "qcomflash"
   extra: |
-    DISTRO_FEATURES:append = " efi pni-names"
     EXTRA_IMAGE_FEATURES = "allow-empty-password empty-root-password allow-root-login"
     IMAGE_ROOTFS_EXTRA_SPACE = "307200"
 
diff --git a/ci/localconfmods.yml b/ci/localconfmods.yml
new file mode 100644
index 000000000..318ea3cd6
--- /dev/null
+++ b/ci/localconfmods.yml
@@ -0,0 +1,15 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json
+
+header:
+  version: 14
+
+local_conf_header:
+  base: |
+    CONF_VERSION = "2"
+    INIT_MANAGER = "systemd"
+    PACKAGE_CLASSES = "package_ipk"
+    INHERIT += "buildstats buildstats-summary"
+    INHERIT += "buildhistory"
+    INHERIT += "rm_work"
+  extra: |
+    DISTRO_FEATURES:append = " efi pni-names"