From 1f548fce10c8f68944dbdcb9545d00bb103fbd48 Mon Sep 17 00:00:00 2001 From: Diego Sueiro Date: Mon, 11 Jan 2021 15:08:43 +0000 Subject: [PATCH] arm-autonomy/linux-arm-autonomy: apply runstate fix to kernels older than 5.10 The patch introduced in 82ffc86 is a backport from the 5.10 version. Hence, just apply it for kernels older than 5.10. Change-Id: I6f442f540913b5e24bea533a436b4a3104d098e9 Issue-Id: SCM-2033 Signed-off-by: Diego Sueiro Signed-off-by: Jon Mason --- .../features/arm-autonomy/xen-common.scc | 2 -- ...-do-not-setup-the-runstate-info-page-if-kpti-.patch | 0 .../recipes-kernel/linux/linux-arm-autonomy.inc | 10 ++++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) rename meta-arm-autonomy/recipes-kernel/linux/{arm-autonomy-kmeta/features/arm-autonomy => files}/0001-xen-arm-do-not-setup-the-runstate-info-page-if-kpti-.patch (100%) diff --git a/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-common.scc b/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-common.scc index beee091b..f359d8c2 100644 --- a/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-common.scc +++ b/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/xen-common.scc @@ -1,5 +1,3 @@ define KFEATURE_DESCRIPTION "Common XEN (Host and Guest) configs and patches on autonomy systems" kconf non-hardware xen-common.cfg - -patch 0001-xen-arm-do-not-setup-the-runstate-info-page-if-kpti-.patch diff --git a/meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/0001-xen-arm-do-not-setup-the-runstate-info-page-if-kpti-.patch b/meta-arm-autonomy/recipes-kernel/linux/files/0001-xen-arm-do-not-setup-the-runstate-info-page-if-kpti-.patch similarity index 100% rename from meta-arm-autonomy/recipes-kernel/linux/arm-autonomy-kmeta/features/arm-autonomy/0001-xen-arm-do-not-setup-the-runstate-info-page-if-kpti-.patch rename to meta-arm-autonomy/recipes-kernel/linux/files/0001-xen-arm-do-not-setup-the-runstate-info-page-if-kpti-.patch diff --git a/meta-arm-autonomy/recipes-kernel/linux/linux-arm-autonomy.inc b/meta-arm-autonomy/recipes-kernel/linux/linux-arm-autonomy.inc index c5cb66d2..89c9fce1 100644 --- a/meta-arm-autonomy/recipes-kernel/linux/linux-arm-autonomy.inc +++ b/meta-arm-autonomy/recipes-kernel/linux/linux-arm-autonomy.inc @@ -33,3 +33,13 @@ KMACHINE_arm64-autonomy-guest = "arm64-autonomy-guest" # Add Minimal Kernel Configs for Docker runtime KERNEL_FEATURES += "${@bb.utils.contains('DISTRO_FEATURES', \ 'docker', 'features/arm-autonomy/docker-minimal.scc', '', d)}" + +python() { + from distutils.version import LooseVersion + + kernelVersion = d.getVar('LINUX_VERSION') + + if kernelVersion and LooseVersion(kernelVersion) < '5.10': + if oe.utils.any_distro_features(d, "arm-autonomy-host arm-autonomy-guest"): + d.appendVar('SRC_URI', ' file://files/0001-xen-arm-do-not-setup-the-runstate-info-page-if-kpti-.patch' ) +}