diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-09-23 22:20:47 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-09-24 17:44:55 +0100 |
commit | be8a48e0de987842b5969fc89b75d97b8fd7f118 (patch) | |
tree | 73eeb15c4c5314a10df3081913d53c06e307db9a /meta | |
parent | 342d18ee78c1cc6dabf270d2a62988185f8822ad (diff) | |
download | poky-be8a48e0de987842b5969fc89b75d97b8fd7f118.tar.gz |
linux-yocto/5.15: cfg: fix ACPI warnings for -tiny
Integrating the following commit(s) to linux-yocto/.:
1128d7bcdcd acpi: fix defaults for x86 and qemuarm64
(From OE-Core rev: 42e414ad2204949bb70c3aa64503a6ef5681532d)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.15.bb | 22 |
3 files changed, 15 insertions, 15 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index 65a0b5c5a4..6f8648e004 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | |||
@@ -11,8 +11,8 @@ python () { | |||
11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "98f38e83ef2d2b00de16c507c308bd806661a53f" | 14 | SRCREV_machine ?= "dba1b7d90813231782bdeda1bd169c93b35c94e0" |
15 | SRCREV_meta ?= "81c59906067bcb77841113c76daad85fb94688d6" | 15 | SRCREV_meta ?= "1128d7bcdcde490d4f35cc00c97f5410bb240d99" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 358501fc2e..4f2bb48743 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | |||
@@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" | |||
14 | KMETA = "kernel-meta" | 14 | KMETA = "kernel-meta" |
15 | KCONF_BSP_AUDIT_LEVEL = "2" | 15 | KCONF_BSP_AUDIT_LEVEL = "2" |
16 | 16 | ||
17 | SRCREV_machine ?= "35d0c78ae3efd6fe1c4fcbf4c8b0d7f43fc2aff7" | 17 | SRCREV_machine ?= "33e7eea5c4545a973cf01a849c2b45fa0cd1fa13" |
18 | SRCREV_meta ?= "81c59906067bcb77841113c76daad85fb94688d6" | 18 | SRCREV_meta ?= "1128d7bcdcde490d4f35cc00c97f5410bb240d99" |
19 | 19 | ||
20 | PV = "${LINUX_VERSION}+git${SRCPV}" | 20 | PV = "${LINUX_VERSION}+git${SRCPV}" |
21 | 21 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index 3b4eb4d844..2f91fb7a37 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb | |||
@@ -13,17 +13,17 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" | |||
13 | KBRANCH:qemux86-64 ?= "v5.15/standard/base" | 13 | KBRANCH:qemux86-64 ?= "v5.15/standard/base" |
14 | KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" | 14 | KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" |
15 | 15 | ||
16 | SRCREV_machine:qemuarm ?= "1e5a26d496c1671b38474e191bb748a47dc7dc59" | 16 | SRCREV_machine:qemuarm ?= "efe28b4b16d4a1a19f59b4650a0bfb23ffc8c40e" |
17 | SRCREV_machine:qemuarm64 ?= "e4f332a5c08ddebbd1a36cff5270e5eebe278cf4" | 17 | SRCREV_machine:qemuarm64 ?= "66986670c45f63d2ed2078e07aa817ede88025ad" |
18 | SRCREV_machine:qemumips ?= "4dd7bbdb60c07d2861468a9c8545ac9e97ba400d" | 18 | SRCREV_machine:qemumips ?= "aeeb80fd7f684aca830adb7daf32cfd80637cf3a" |
19 | SRCREV_machine:qemuppc ?= "c1ddaa69dd463a11645cc5362a3200dbce28d664" | 19 | SRCREV_machine:qemuppc ?= "5c6387a562af89ec92546c1374a120ac240f14e6" |
20 | SRCREV_machine:qemuriscv64 ?= "c9162b76e4f4dad76ff499cf427f45f3383b8a57" | 20 | SRCREV_machine:qemuriscv64 ?= "0e51e571701842db33ad96f6ddc8cc6b23230627" |
21 | SRCREV_machine:qemuriscv32 ?= "c9162b76e4f4dad76ff499cf427f45f3383b8a57" | 21 | SRCREV_machine:qemuriscv32 ?= "0e51e571701842db33ad96f6ddc8cc6b23230627" |
22 | SRCREV_machine:qemux86 ?= "c9162b76e4f4dad76ff499cf427f45f3383b8a57" | 22 | SRCREV_machine:qemux86 ?= "0e51e571701842db33ad96f6ddc8cc6b23230627" |
23 | SRCREV_machine:qemux86-64 ?= "c9162b76e4f4dad76ff499cf427f45f3383b8a57" | 23 | SRCREV_machine:qemux86-64 ?= "0e51e571701842db33ad96f6ddc8cc6b23230627" |
24 | SRCREV_machine:qemumips64 ?= "481a521e65375aeef6b8903c8df6fc2b23a184b8" | 24 | SRCREV_machine:qemumips64 ?= "20ec37851f4ee9965120937dcf2567f15e72e07a" |
25 | SRCREV_machine ?= "c9162b76e4f4dad76ff499cf427f45f3383b8a57" | 25 | SRCREV_machine ?= "0e51e571701842db33ad96f6ddc8cc6b23230627" |
26 | SRCREV_meta ?= "81c59906067bcb77841113c76daad85fb94688d6" | 26 | SRCREV_meta ?= "1128d7bcdcde490d4f35cc00c97f5410bb240d99" |
27 | 27 | ||
28 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll | 28 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll |
29 | # get the <version>/base branch, which is pure upstream -stable, and the same | 29 | # get the <version>/base branch, which is pure upstream -stable, and the same |