From 5d401b9a77c465951113c68b401c62705124cb9d Mon Sep 17 00:00:00 2001 From: Peter Hoyes Date: Tue, 9 Mar 2021 17:00:25 +0000 Subject: [PATCH] arm-autonomy/n1sdp: Use anonymous function to set kernel provider Only set PREFERRED_PROVIDER_virtual/kernel in arm-autonomy to linux-linaro-arm if it is set to linux-yocto. Allows it to be modifed from local.conf, e.g. for RT builds. Issue-Id: SCM-2185 Signed-off-by: Peter Hoyes Change-Id: Ied871389ccaa017437babb4f0cb48d23862eb7bd Signed-off-by: Jon Mason --- .../meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc index f39e2ea3..3612b2e5 100644 --- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc +++ b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/n1sdp-extra-settings.inc @@ -50,8 +50,11 @@ IMAGE_EFI_BOOT_FILES += "xen-n1sdp.efi;xen.efi" IMAGE_EFI_BOOT_FILES += "${XEN_MOD_DEVICETREE_DTBS}" # Use 5.4 kernel until later versions have been validated for autonomy-host -PREFERRED_PROVIDER_virtual/kernel = "linux-linaro-arm" -PREFERRED_VERSION_linux-linaro-arm = "5.4%" +python() { + if d.getVar('PREFERRED_PROVIDER_virtual/kernel') == 'linux-yocto': + d.setVar('PREFERRED_PROVIDER_virtual/kernel', 'linux-linaro-arm') + d.setVar('PREFERRED_VERSION_linux-linaro-arm', '5.4%') +} # When alternate-kernel DISTRO_FEATURE is present we set the linux-linaro-arm-rt # by default