From 7071752b5d5cad8e9ffbe14cbd38141dcdb81311 Mon Sep 17 00:00:00 2001
From: h5b <h5b@users.noreply.github.com>
Date: Tue, 13 Feb 2024 16:48:41 +0100
Subject: [PATCH] Provide up-to-date SDK

Switch (and rename) image to build a minimal SDK suitable
for core development tasks.
---
 recipes-core/images/protos-core-image-dev.bb | 32 -----------------
 recipes-core/images/protos-core-sdk.bb       | 38 ++++++++++++++++++++
 2 files changed, 38 insertions(+), 32 deletions(-)
 delete mode 100644 recipes-core/images/protos-core-image-dev.bb
 create mode 100644 recipes-core/images/protos-core-sdk.bb

diff --git a/recipes-core/images/protos-core-image-dev.bb b/recipes-core/images/protos-core-image-dev.bb
deleted file mode 100644
index 72442b0..0000000
--- a/recipes-core/images/protos-core-image-dev.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "PROTOS core image suitable for development work."
-
-EXTRA_IMAGE_FEATURES += "dev-pkgs"
-EXTRA_IMAGE_FEATURES += "staticdev-pkgs"
-EXTRA_IMAGE_FEATURES += "tools-sdk"
-EXTRA_IMAGE_FEATURES += "x11-base"
-
-TOOLCHAIN_TARGET_TASK:append = "\
-    extra-cmake-modules \
-    fontconfig \
-    libxft \
-"
-
-TOOLCHAIN_HOST_TASK:append = "\
-    nativesdk-fontconfig \
-    nativesdk-libxft \
-    nativesdk-wayland \
-    nativesdk-wayland-dev \
-"
-
-IMAGE_INSTALL:append = "\
-    weston \
-    wayland \
-    wayland-protocols \
-"
-
-GCC_VERSION = "gcc93"
-
-TOOLCHAIN_OUTPUTNAME ?= "${DISTRO}-${SDKMACHINE}-toolchain-${GCC_VERSION}-${MACHINE}-${DISTRO_VERSION}"
-TOOLCHAINEXT_OUTPUTNAME ?= "${DISTRO}-${SDKMACHINE}-toolchain-ext-${GCC_VERSION}-${MACHINE}-${DISTRO_VERSION}"
-
-inherit core-image
diff --git a/recipes-core/images/protos-core-sdk.bb b/recipes-core/images/protos-core-sdk.bb
new file mode 100644
index 0000000..f6b852a
--- /dev/null
+++ b/recipes-core/images/protos-core-sdk.bb
@@ -0,0 +1,38 @@
+DESCRIPTION = "PROTOS core SDK suitable for development work."
+LICENSE = "MIT"
+
+CVE_PRODUCT = ""
+
+inherit populate_sdk
+
+SDK_FEATURES:append = "dev-pkgs tools-sdk staticdev-pkgs"
+SDK_FEATURES:remove = "dbg-pkgs src-pkgs"
+
+TOOLCHAIN_TARGET_TASK:append = "\
+    extra-cmake-modules \
+    fontconfig \
+    libx11 \
+    libxft \
+    libxi \
+    libxmu \
+    libxt \
+    meson \
+    wayland \
+"
+
+TOOLCHAIN_HOST_TASK:append = "\
+    nativesdk-clang \
+    nativesdk-cmake \
+    nativesdk-fontconfig \
+    nativesdk-libx11 \
+    nativesdk-libxft \
+    nativesdk-make \
+    nativesdk-wayland \
+    nativesdk-wayland-dev \
+"
+
+GCC_VERSION = "gcc114"
+
+TOOLCHAIN_OUTPUTNAME = "${DISTRO}-${SDKMACHINE}-toolchain-${GCC_VERSION}-${MACHINE}-${DISTRO_VERSION}"
+TOOLCHAINEXT_OUTPUTNAME = "${DISTRO}-${SDKMACHINE}-toolchain-ext-${GCC_VERSION}-${MACHINE}-${DISTRO_VERSION}"
+