diff options
| author |   Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-06-27 10:24:19 -0400 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2023-06-29 03:55:23 -1000 |
| commit | 13add4fd84c2e8a14caad857fbadf83205758c31 (patch) | |
| tree | fa48c9d9e6874e6e9c21866d5201637ca11f7361 /meta/recipes-kernel | |
| parent | ff0f134daad2e1cae942355c9a8eb177be607d13 (diff) | |
| download | openembedded-core-contrib-13add4fd84c2e8a14caad857fbadf83205758c31.tar.gz | |
linux-yocto-rt/54: fix 5.4-rt build breakage
Integrating the following commit:
commit 8d8179549a233e7517523ac12887016451da2e20
Author: Bruce Ashfield <bruce.ashfield@gmail.com>
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 <bruce.ashfield@gmail.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/recipes-kernel')
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 2 | ||||
| -rw-r--r-- | 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 a98a64110a..541d169379 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 46a8856963..171ff8493c 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 fae2de5c72..527728d9d0 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" |