From c21d75720f29a3c3e8b9b1fd439c1f4a48d9d0e1 Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Thu, 14 Aug 2025 21:54:41 -0600 Subject: [PATCH] zephyr-kernel-src: Remove PREFERRED_VERSION_zephyr-kernel Remove PREFERRED_VERSION_zephyr-kernel from zephyr-kernel-src.inc as this variable should be in global configuration file and override from local.conf file. Set default stable PREFERRED_VERSION for kernel and sdk in layer.conf file. Signed-off-by: Sandeep Gundlupet Raju --- meta-zephyr-core/conf/layer.conf | 3 +++ .../recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-zephyr-core/conf/layer.conf b/meta-zephyr-core/conf/layer.conf index 5afec0f..c04088f 100644 --- a/meta-zephyr-core/conf/layer.conf +++ b/meta-zephyr-core/conf/layer.conf @@ -20,3 +20,6 @@ LAYERSERIES_COMPAT_zephyrcore = "whinlatter" PYTHON3_NATIVE_SITEPACKAGES_DIR = "${libdir_native}/${PYTHON3_DIR}/site-packages" addpylib ${LAYERDIR}/lib oeqa + +PREFERRED_VERSION_zephyr-kernel ??= "4.1.0" +PREFERRED_VERSION_zephyr-sdk ??= "0.16.9" diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc index cf1b593..34b2cbe 100644 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc +++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc @@ -10,6 +10,4 @@ inherit cmake # find the patch(es) in SRC_URI. FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -# Default to a stable version -PREFERRED_VERSION_zephyr-kernel ??= "4.1.0" require recipes-kernel/zephyr-kernel/zephyr-kernel-src-${PREFERRED_VERSION_zephyr-kernel}.inc