diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-07-13 14:33:23 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-14 23:22:10 +0100 |
commit | 442d79a39bf4e4ec8d41cd0195105b444fc583f6 (patch) | |
tree | e592ccb99caff28fb0edca9e6323eb087cbd1d13 /meta | |
parent | 6c91fe738308acbedd19627a8d8b5d6c6319bf9e (diff) | |
download | poky-442d79a39bf4e4ec8d41cd0195105b444fc583f6.tar.gz |
linux-yocto/5.15: fix buildpaths issue with gen-mach-types
Integrating the following commit(s) to linux-yocto/5.15:
6c085baf1838 tools: use basename to identify file in gen-mach-types
(From OE-Core rev: d5db9594da2bdc6d13be2190d10739b51de57890)
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 | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.15.bb | 20 |
3 files changed, 12 insertions, 12 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 61b1df04a9..f1f5de3b18 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | |||
@@ -11,7 +11,7 @@ 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 ?= "4132e425a2dee778212b42d99a9812fe1c78a03d" | 14 | SRCREV_machine ?= "3a7da2af1ba40b8c2247bac03a1fae488a1abde2" |
15 | SRCREV_meta ?= "f122fe59e74365eba84bae800898ffd7329c628d" | 15 | SRCREV_meta ?= "f122fe59e74365eba84bae800898ffd7329c628d" |
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 \ |
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 7c81b048dc..e271c6741a 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | |||
@@ -14,7 +14,7 @@ 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 ?= "b2dcc4f70362059ef107000f9be5c76c2886911c" | 17 | SRCREV_machine ?= "122de5742628e6b4303f0bbc653d409ff9f93557" |
18 | SRCREV_meta ?= "f122fe59e74365eba84bae800898ffd7329c628d" | 18 | SRCREV_meta ?= "f122fe59e74365eba84bae800898ffd7329c628d" |
19 | 19 | ||
20 | PV = "${LINUX_VERSION}+git${SRCPV}" | 20 | PV = "${LINUX_VERSION}+git${SRCPV}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index 3e22f8d570..1c090db7b8 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb | |||
@@ -13,16 +13,16 @@ 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 ?= "3d2ffe77f277a0a650e7d012c5bfe3765a467e4b" | 16 | SRCREV_machine:qemuarm ?= "41652fad285637467681f47d4e94a886ffb473cd" |
17 | SRCREV_machine:qemuarm64 ?= "1da6524b1508ca6e9b6602471b478d310bec1960" | 17 | SRCREV_machine:qemuarm64 ?= "b28bd930f849c23a8f1576b22a8e59a0b2ac8cc1" |
18 | SRCREV_machine:qemumips ?= "4101fd448319edc00fec2bd822be407d19205bb9" | 18 | SRCREV_machine:qemumips ?= "fb51b7d8d905883f2595f006428c142975231886" |
19 | SRCREV_machine:qemuppc ?= "651a0112fb207bae1be0d2609e9a910135fb4feb" | 19 | SRCREV_machine:qemuppc ?= "731587ce51ec087bfbb6255a1e9c763b4f71f7cb" |
20 | SRCREV_machine:qemuriscv64 ?= "2fca0fd719812ea2ff67630b01355aa80481623e" | 20 | SRCREV_machine:qemuriscv64 ?= "6c085baf183868ed45d8c1d44408d7b24724cde5" |
21 | SRCREV_machine:qemuriscv32 ?= "2fca0fd719812ea2ff67630b01355aa80481623e" | 21 | SRCREV_machine:qemuriscv32 ?= "6c085baf183868ed45d8c1d44408d7b24724cde5" |
22 | SRCREV_machine:qemux86 ?= "2fca0fd719812ea2ff67630b01355aa80481623e" | 22 | SRCREV_machine:qemux86 ?= "6c085baf183868ed45d8c1d44408d7b24724cde5" |
23 | SRCREV_machine:qemux86-64 ?= "2fca0fd719812ea2ff67630b01355aa80481623e" | 23 | SRCREV_machine:qemux86-64 ?= "6c085baf183868ed45d8c1d44408d7b24724cde5" |
24 | SRCREV_machine:qemumips64 ?= "d518b9a80c938ca7ce11e56d2275c33b89dfc9c3" | 24 | SRCREV_machine:qemumips64 ?= "5fcf0d1536623c9ede2ee54d143a650c59ca9d59" |
25 | SRCREV_machine ?= "2fca0fd719812ea2ff67630b01355aa80481623e" | 25 | SRCREV_machine ?= "6c085baf183868ed45d8c1d44408d7b24724cde5" |
26 | SRCREV_meta ?= "f122fe59e74365eba84bae800898ffd7329c628d" | 26 | SRCREV_meta ?= "f122fe59e74365eba84bae800898ffd7329c628d" |
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 |