From 13add4fd84c2e8a14caad857fbadf83205758c31 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 27 Jun 2023 10:24:19 -0400 Subject: [PATCH] linux-yocto-rt/54: fix 5.4-rt build breakage Integrating the following commit: commit 8d8179549a233e7517523ac12887016451da2e20 Author: Bruce Ashfield Date: Tue Jun 27 10:13:01 2023 -0400 rt: fix 5.4-stable introduced compile errors The 5.4 stable series brough back two elements removed by the -rt patch: - tick_period - deferred/safe printk We fix the build by dropping the use of the period and deferred printk Signed-off-by: Bruce Ashfield Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index a98a64110af..541d1693796 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "8472ed342e0ac3f529c10b474b12ef0e05995778" -SRCREV_meta ?= "5c912968f2cb938ad084d457dae99bf8eb16032d" +SRCREV_machine ?= "8d8179549a233e7517523ac12887016451da2e20" +SRCREV_meta ?= "b6e41788aebaf8058d1f15f6cdcf55a6edb77755" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 46a88569631..171ff8493ce 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine_qemuarm ?= "ca5368c73bab4eb276a8e721df28c02ceb8f3eeb" SRCREV_machine ?= "abb579170926348d1518bc1a2de8cb1cdf403808" -SRCREV_meta ?= "5c912968f2cb938ad084d457dae99bf8eb16032d" +SRCREV_meta ?= "b6e41788aebaf8058d1f15f6cdcf55a6edb77755" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index fae2de5c724..527728d9d02 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -21,7 +21,7 @@ SRCREV_machine_qemux86 ?= "d18af0e8acb7c4cb245739fa8165a44845ff2ba0" SRCREV_machine_qemux86-64 ?= "d18af0e8acb7c4cb245739fa8165a44845ff2ba0" SRCREV_machine_qemumips64 ?= "66cac7d41a43594760f6ac48e848d73315cc5dd3" SRCREV_machine ?= "d18af0e8acb7c4cb245739fa8165a44845ff2ba0" -SRCREV_meta ?= "5c912968f2cb938ad084d457dae99bf8eb16032d" +SRCREV_meta ?= "b6e41788aebaf8058d1f15f6cdcf55a6edb77755" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" -- 2.47.3