summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2023-07-06 00:29:55 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-07-12 16:50:45 +0100
commit1c9a03f45cb8d934272e1dfdc5ee4306d4459854 (patch)
treed1c0b98a217625bd6837c2fc20011b2a7b5ac8f6
parent98bbb8a61e698685a24b9c0c4039a02ba48df44e (diff)
downloadpoky-1c9a03f45cb8d934272e1dfdc5ee4306d4459854.tar.gz
linux-yocto/6.4: update to latest
Integrating the following commit(s) to linux-yocto/6.4: 9ede8913ad6c qemux86: add configuration symbol to select values (From OE-Core rev: 6ee1874c96fac602dfd4f28924a07b67fe1d74fa) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_6.4.bb26
3 files changed, 17 insertions, 17 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
index 2558c03a7f..524cd95ac3 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
@@ -14,8 +14,8 @@ python () {
14 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 14 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
15} 15}
16 16
17SRCREV_machine ?= "48cdae83316b7055b4e63f3434ea26b0c04d7c71" 17SRCREV_machine ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
18SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb" 18SRCREV_meta ?= "7468cf421d9c83d16e44c281b123433d875ff0f9"
19 19
20SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ 20SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
21 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.4;destsuffix=${KMETA};protocol=https" 21 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.4;destsuffix=${KMETA};protocol=https"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
index 5c8008232b..9e2a3e68f9 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native"
17KMETA = "kernel-meta" 17KMETA = "kernel-meta"
18KCONF_BSP_AUDIT_LEVEL = "2" 18KCONF_BSP_AUDIT_LEVEL = "2"
19 19
20SRCREV_machine ?= "154c43de4e13946ccecf0ff13772db6c2adba355" 20SRCREV_machine ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
21SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb" 21SRCREV_meta ?= "7468cf421d9c83d16e44c281b123433d875ff0f9"
22 22
23PV = "${LINUX_VERSION}+git${SRCPV}" 23PV = "${LINUX_VERSION}+git${SRCPV}"
24 24
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.4.bb b/meta/recipes-kernel/linux/linux-yocto_6.4.bb
index e3e6e54d64..dd68c640d5 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.4.bb
@@ -17,25 +17,25 @@ KBRANCH:qemux86-64 ?= "v6.4/standard/base"
17KBRANCH:qemuloongarch64 ?= "v6.4/standard/base" 17KBRANCH:qemuloongarch64 ?= "v6.4/standard/base"
18KBRANCH:qemumips64 ?= "v6.4/standard/mti-malta64" 18KBRANCH:qemumips64 ?= "v6.4/standard/mti-malta64"
19 19
20SRCREV_machine:qemuarm ?= "fccbb53f81908991a69214e09ae0eea360410617" 20SRCREV_machine:qemuarm ?= "402087b6abe0e50ec75d0b71b4c928ee0b858b72"
21SRCREV_machine:qemuarm64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" 21SRCREV_machine:qemuarm64 ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
22SRCREV_machine:qemuloongarch64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" 22SRCREV_machine:qemuloongarch64 ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
23SRCREV_machine:qemumips ?= "8370d3d4823bcff9532dd6bb163359f75a5416cd" 23SRCREV_machine:qemumips ?= "b83174914441d8780f080e73d473133e2c5b797c"
24SRCREV_machine:qemuppc ?= "154c43de4e13946ccecf0ff13772db6c2adba355" 24SRCREV_machine:qemuppc ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
25SRCREV_machine:qemuriscv64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" 25SRCREV_machine:qemuriscv64 ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
26SRCREV_machine:qemuriscv32 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" 26SRCREV_machine:qemuriscv32 ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
27SRCREV_machine:qemux86 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" 27SRCREV_machine:qemux86 ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
28SRCREV_machine:qemux86-64 ?= "154c43de4e13946ccecf0ff13772db6c2adba355" 28SRCREV_machine:qemux86-64 ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
29SRCREV_machine:qemumips64 ?= "efe0a0701a1a8c5b6113d6a06b65857f8c84ac9f" 29SRCREV_machine:qemumips64 ?= "a08de9073de96586993c5d8c1f0ebcdc35874ebf"
30SRCREV_machine ?= "154c43de4e13946ccecf0ff13772db6c2adba355" 30SRCREV_machine ?= "9ede8913ad6c0768bde9f277c419c8728af3ed5e"
31SRCREV_meta ?= "f15c15c0755e36ec185927dd83a8a569186836eb" 31SRCREV_meta ?= "7468cf421d9c83d16e44c281b123433d875ff0f9"
32 32
33# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll 33# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
34# get the <version>/base branch, which is pure upstream -stable, and the same 34# get the <version>/base branch, which is pure upstream -stable, and the same
35# meta SRCREV as the linux-yocto-standard builds. Select your version using the 35# meta SRCREV as the linux-yocto-standard builds. Select your version using the
36# normal PREFERRED_VERSION settings. 36# normal PREFERRED_VERSION settings.
37BBCLASSEXTEND = "devupstream:target" 37BBCLASSEXTEND = "devupstream:target"
38SRCREV_machine:class-devupstream ?= "0f4ac6b4c5f00f45b7a429c8a5b028a598c6400c" 38SRCREV_machine:class-devupstream ?= "6995e2de6891c724bfeb2db33d7b87775f913ad1"
39PN:class-devupstream = "linux-yocto-upstream" 39PN:class-devupstream = "linux-yocto-upstream"
40KBRANCH:class-devupstream = "v6.4/base" 40KBRANCH:class-devupstream = "v6.4/base"
41 41