From 9621dcb027782b683e87445239cc6677fcc00aaf Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Wed, 24 Mar 2021 12:06:37 +0100 Subject: Upgrade to gatesgarth This is an initial commit, containing quick fixes and hacks to allow building the images. All these issues will be re-evaluated and fixed properly in their own commits. Signed-off-by: Adrian Dudau --- conf/machine/atom-c3000.conf | 2 +- conf/machine/xeon-d.conf | 2 +- recipes-kernel/linux/linux-intel-guest_4.14.bb | 1 - recipes-kernel/linux/linux-intel-guest_5.10.bb | 1 + recipes-kernel/linux/linux-intel-host_4.14.bb | 1 - recipes-kernel/linux/linux-intel-host_5.10.bb | 1 + recipes-kernel/linux/linux-intel.inc | 13 +++++-------- 7 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 recipes-kernel/linux/linux-intel-guest_4.14.bb create mode 100644 recipes-kernel/linux/linux-intel-guest_5.10.bb delete mode 100644 recipes-kernel/linux/linux-intel-host_4.14.bb create mode 100644 recipes-kernel/linux/linux-intel-host_5.10.bb diff --git a/conf/machine/atom-c3000.conf b/conf/machine/atom-c3000.conf index 9ce89bd..d3fb5bb 100644 --- a/conf/machine/atom-c3000.conf +++ b/conf/machine/atom-c3000.conf @@ -11,7 +11,7 @@ # Soft set linux-yocto as preferred kernel like x86-base.inc PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel-host" PREFERRED_PROVIDER_virtual/kernel_poky-tiny ?= "linux-intel-host" -PREFERRED_VERSION_linux-intel-host ?= "4.14%" +PREFERRED_VERSION_linux-intel-host ?= "5.10%" MACHINE_FEATURES += "pcbios efi" diff --git a/conf/machine/xeon-d.conf b/conf/machine/xeon-d.conf index bfa6322..f3ee8c0 100644 --- a/conf/machine/xeon-d.conf +++ b/conf/machine/xeon-d.conf @@ -9,7 +9,7 @@ # Soft set linux-yocto as preferred kernel like x86-base.inc PREFERRED_PROVIDER_virtual/kernel ?= "linux-intel-host" PREFERRED_PROVIDER_virtual/kernel_poky-tiny ?= "linux-intel-host" -PREFERRED_VERSION_linux-intel ?= "4.14%" +PREFERRED_VERSION_linux-intel ?= "5.10%" MACHINE_FEATURES += "pcbios efi" diff --git a/recipes-kernel/linux/linux-intel-guest_4.14.bb b/recipes-kernel/linux/linux-intel-guest_4.14.bb deleted file mode 100644 index 6be0508..0000000 --- a/recipes-kernel/linux/linux-intel-guest_4.14.bb +++ /dev/null @@ -1 +0,0 @@ -require linux-intel.inc diff --git a/recipes-kernel/linux/linux-intel-guest_5.10.bb b/recipes-kernel/linux/linux-intel-guest_5.10.bb new file mode 100644 index 0000000..6be0508 --- /dev/null +++ b/recipes-kernel/linux/linux-intel-guest_5.10.bb @@ -0,0 +1 @@ +require linux-intel.inc diff --git a/recipes-kernel/linux/linux-intel-host_4.14.bb b/recipes-kernel/linux/linux-intel-host_4.14.bb deleted file mode 100644 index 6be0508..0000000 --- a/recipes-kernel/linux/linux-intel-host_4.14.bb +++ /dev/null @@ -1 +0,0 @@ -require linux-intel.inc diff --git a/recipes-kernel/linux/linux-intel-host_5.10.bb b/recipes-kernel/linux/linux-intel-host_5.10.bb new file mode 100644 index 0000000..6be0508 --- /dev/null +++ b/recipes-kernel/linux/linux-intel-host_5.10.bb @@ -0,0 +1 @@ +require linux-intel.inc diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index d0b951a..52e6e62 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -1,10 +1,10 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:" -require common/recipes-kernel/linux/linux-intel_4.14.bb +require recipes-kernel/linux/linux-intel_5.10.bb require recipes-kernel/linux/linux-deploy-kconfig.inc require recipes-kernel/linux/linux-common-config.inc -LINUX_VERSION = "4.14.123" -SRCREV_machine = "6aab3d561d738f3ceb9230a828b3f0b1ed5e98a3" +LINUX_VERSION = "5.10.8" + SRCREV_metaenea = "7a93e54032bb148a92e16b59736a1b76fedae319" KENEABRANCH = "intel-4.14" SRC_URI_append = " git://git@git.enea.com/linux/enea-kernel-cache.git;protocol=ssh;type=kmeta;name=metaenea;branch=${KENEABRANCH};destsuffix=enea-kernel-meta" @@ -32,13 +32,10 @@ KERNEL_FEATURES_append = " features/ipmi/ipmi.scc" KERNEL_FEATURES_append = " features/ipmi/ipmi_ssif.scc" # IPv4 waiting for carrier on -KERNEL_FEATURES_append = " patches/ipv4/ipv4wait.scc" - -# Fixes for kernel -KERNEL_FEATURES_append = " patches/security/keys.scc" +#KERNEL_FEATURES_append = " patches/ipv4/ipv4wait.scc" # Fixes for pci KERNEL_FEATURES_append = " patches/drivers/pci/quirks.scc" # Fixes for ACPI PCCT (upstream in kernel v4.18-rc1 or newer) -KERNEL_FEATURES_append = " patches/drivers/mailbox/acpi-pcct.scc" +#KERNEL_FEATURES_append = " patches/drivers/mailbox/acpi-pcct.scc" -- cgit v1.2.3-54-g00ecf