diff options
| author |   Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-12-11 09:28:38 -0500 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2023-12-11 04:37:38 -1000 |
| commit | f29aff4a2a907f70c5397f9f1f7b5c1f8beb8647 (patch) | |
| tree | 6679ac8b3ed4e41e1c8c17ec9aa9927f6f1a7e47 | |
| parent | 7e65b351fa8eda4ee7b9f1f2a8dbfe14e0ef697a (diff) | |
| download | openembedded-core-contrib-f29aff4a2a907f70c5397f9f1f7b5c1f8beb8647.tar.gz | |
linux-yocto-rt/5.4: fix buld failure
Integrating the following commit(s) to linux-yocto/5.4:
1/1 [
Author: Bruce Ashfield
Email: bruce.ashfield@gmail.com
Subject: rt: drop -stable migrate_disable
Date: Mon, 11 Dec 2023 08:50:52 -0500
The -rt branches already have a migrate disable mechanism, we
drop the -stable version to fix build issues.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
]
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -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 | 6 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.4.bb | 20 |
3 files changed, 15 insertions, 15 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 396d218afd..58e10be524 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 ?= "9ef07d0d41fa14bf7366dfe5ef657d9f24b35349" -SRCREV_meta ?= "9f1a56eeea58f7d9b597f0ea33e43e35b8288762" +SRCREV_machine ?= "43d5f7eb85acc21ec87ec45b2cae127dad8bf7a4" +SRCREV_meta ?= "34f54c16ac6ef29441f95dd3b932729f01008999" 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 1048af2f79..01894be10c 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "73dbd7ea55670218b017d9719868e7d61d0b1011" -SRCREV_machine ?= "0b41bdd8d544c72af97c34e9c464b7534fd18c7a" -SRCREV_meta ?= "9f1a56eeea58f7d9b597f0ea33e43e35b8288762" +SRCREV_machine_qemuarm ?= "7c33fa232f43e9059395bd30e23ef3c16359ba11" +SRCREV_machine ?= "42abef1facd8bc8d1f51470493f08d87d0862f8e" +SRCREV_meta ?= "34f54c16ac6ef29441f95dd3b932729f01008999" 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 e932394c90..e8d935edea 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -13,16 +13,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "62367606f47fb5832c10c3d5ea370f9d162504a0" -SRCREV_machine_qemuarm64 ?= "dbcb9a6b795e82a7869f213ce4a7d30779cc0b5c" -SRCREV_machine_qemumips ?= "0386462f3785de758d8c333ddfa9b3a7ce26e048" -SRCREV_machine_qemuppc ?= "4bc83a0d08c8ca1fba167dff9dc652055626837c" -SRCREV_machine_qemuriscv64 ?= "4d141be8fd148e0ea68d8f957f527ad5f22015ab" -SRCREV_machine_qemux86 ?= "4d141be8fd148e0ea68d8f957f527ad5f22015ab" -SRCREV_machine_qemux86-64 ?= "4d141be8fd148e0ea68d8f957f527ad5f22015ab" -SRCREV_machine_qemumips64 ?= "c60dba46dca65775a5d5bfe0e41b0eb5f55a3ba7" -SRCREV_machine ?= "4d141be8fd148e0ea68d8f957f527ad5f22015ab" -SRCREV_meta ?= "9f1a56eeea58f7d9b597f0ea33e43e35b8288762" +SRCREV_machine_qemuarm ?= "76b8ef2c7ecb7cf484e0eff4d509ec57c310d06e" +SRCREV_machine_qemuarm64 ?= "23b9912a979d98708f3adc8312af42eb9049c1d6" +SRCREV_machine_qemumips ?= "2e266704c46066c80821a491ad6f42c930e00d5d" +SRCREV_machine_qemuppc ?= "2343a888a77678d4440032d22327f753d1a90cdb" +SRCREV_machine_qemuriscv64 ?= "dbf9e2bf8e764643b8ec4c236fbab73228413a33" +SRCREV_machine_qemux86 ?= "dbf9e2bf8e764643b8ec4c236fbab73228413a33" +SRCREV_machine_qemux86-64 ?= "dbf9e2bf8e764643b8ec4c236fbab73228413a33" +SRCREV_machine_qemumips64 ?= "73d9e7eaf1161e5deb6d3fbfdefb07fc5fd87d3f" +SRCREV_machine ?= "dbf9e2bf8e764643b8ec4c236fbab73228413a33" +SRCREV_meta ?= "34f54c16ac6ef29441f95dd3b932729f01008999" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" |