diff mbox series

[meta-zephyr,scarthgap,v5,3/12] zephyr-kernel-src: Remove PREFERRED_VERSION_zephyr-kernel

Message ID 20250812174147.130972-4-sandeep.gundlupet-raju@amd.com
State New
Headers show
Series | expand

Commit Message

Sandeep Gundlupet Raju Aug. 12, 2025, 5:41 p.m. UTC
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 <sandeep.gundlupet-raju@amd.com>
---
 meta-zephyr-core/conf/layer.conf                              | 4 ++++
 .../recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc        | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/meta-zephyr-core/conf/layer.conf b/meta-zephyr-core/conf/layer.conf
index e1bb263..e355b3f 100644
--- a/meta-zephyr-core/conf/layer.conf
+++ b/meta-zephyr-core/conf/layer.conf
@@ -20,3 +20,7 @@  LAYERSERIES_COMPAT_zephyrcore = "kirkstone scarthgap"
 PYTHON3_NATIVE_SITEPACKAGES_DIR = "${libdir_native}/${PYTHON3_DIR}/site-packages"
 
 addpylib ${LAYERDIR}/lib oeqa
+
+# Default to a stable version
+PREFERRED_VERSION_zephyr-kernel ??= "3.6.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 0b9baac..6b2b697 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
@@ -11,6 +11,4 @@  inherit cmake
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 S = "${WORKDIR}/git"
 
-# Default to a stable version
-PREFERRED_VERSION_zephyr-kernel ??= "3.6.0"
 require recipes-kernel/zephyr-kernel/zephyr-kernel-src-${PREFERRED_VERSION_zephyr-kernel}.inc