From f034379238f980a8c5ec4295288448eab2a3d015 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 18 Nov 2020 10:42:21 -0600 Subject: Revert "Revert "poky: subtree update:b23aa6b753..ad30a6d470"" This reverts commit 4873add6e11c1bd421c83cd08df589f1184aa673. A fix has been put up for openbmc/openbmc#3720 so we can bring this back now Signed-off-by: Andrew Geissler Change-Id: If59020a5b502f70aa7149fbef4ad2f50824d1ce6 --- poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend | 8 ++++---- poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.8.bbappend | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'poky/meta-yocto-bsp') diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend index 9c37f91bc..4ee895dbd 100644 --- a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend +++ b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend @@ -7,8 +7,8 @@ KMACHINE_genericx86 ?= "common-pc" KMACHINE_genericx86-64 ?= "common-pc-64" KMACHINE_beaglebone-yocto ?= "beaglebone" -SRCREV_machine_genericx86 ?= "706efec4c1e270ec5dda92275898cd465dfdc7dd" -SRCREV_machine_genericx86-64 ?= "706efec4c1e270ec5dda92275898cd465dfdc7dd" +SRCREV_machine_genericx86 ?= "cfcdd63145c0d741e57ee3e3e58f794229c6c09c" +SRCREV_machine_genericx86-64 ?= "cfcdd63145c0d741e57ee3e3e58f794229c6c09c" SRCREV_machine_edgerouter ?= "706efec4c1e270ec5dda92275898cd465dfdc7dd" SRCREV_machine_beaglebone-yocto ?= "706efec4c1e270ec5dda92275898cd465dfdc7dd" @@ -17,7 +17,7 @@ COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" COMPATIBLE_MACHINE_edgerouter = "edgerouter" COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" -LINUX_VERSION_genericx86 = "5.4.58" -LINUX_VERSION_genericx86-64 = "5.4.58" +LINUX_VERSION_genericx86 = "5.4.69" +LINUX_VERSION_genericx86-64 = "5.4.69" LINUX_VERSION_edgerouter = "5.4.58" LINUX_VERSION_beaglebone-yocto = "5.4.58" diff --git a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.8.bbappend b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.8.bbappend index 5d844423a..a04f332cf 100644 --- a/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.8.bbappend +++ b/poky/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.8.bbappend @@ -7,8 +7,8 @@ KMACHINE_genericx86 ?= "common-pc" KMACHINE_genericx86-64 ?= "common-pc-64" KMACHINE_beaglebone-yocto ?= "beaglebone" -SRCREV_machine_genericx86 ?= "912adf166eb0688e011154048f5fa0e5863249c3" -SRCREV_machine_genericx86-64 ?= "912adf166eb0688e011154048f5fa0e5863249c3" +SRCREV_machine_genericx86 ?= "5981001bf03f0d0c1cf641a2287ab6368baf628a" +SRCREV_machine_genericx86-64 ?= "5981001bf03f0d0c1cf641a2287ab6368baf628a" SRCREV_machine_edgerouter ?= "912adf166eb0688e011154048f5fa0e5863249c3" SRCREV_machine_beaglebone-yocto ?= "912adf166eb0688e011154048f5fa0e5863249c3" @@ -17,7 +17,7 @@ COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" COMPATIBLE_MACHINE_edgerouter = "edgerouter" COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" -LINUX_VERSION_genericx86 = "5.8.2" -LINUX_VERSION_genericx86-64 = "5.8.2" +LINUX_VERSION_genericx86 = "5.8.13" +LINUX_VERSION_genericx86-64 = "5.8.13" LINUX_VERSION_edgerouter = "5.8.2" LINUX_VERSION_beaglebone-yocto = "5.8.2" -- cgit v1.2.3