diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-07-14 15:12:51 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-15 08:21:42 +0100 |
commit | 1f2e1ff374f6d0d929393c6d22888c0c6070555b (patch) | |
tree | 66836739ce1a1546954232b7f5aaf43e27645731 /meta/recipes-kernel | |
parent | 2e5fd122828e0bbc20138a317298ef3dc65fc233 (diff) | |
download | poky-1f2e1ff374f6d0d929393c6d22888c0c6070555b.tar.gz |
linux-yocto/5.10: fix buildpaths issue with pnmtologo
Integrating the following commit(s) to linux-yocto/5.10:
2883e69e202d pnmtologo: use relocatable file name
(From OE-Core rev: 73bc3bfaf06fedff71fcd54d172c4e8df17467a7)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.10.bb | 20 |
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index 40cc21bceb..53ccd41033 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.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 ?= "faeb2e0ef8f7014788d4e8152d4f5698a7472e0f" | 14 | SRCREV_machine ?= "63771123b1eea439bea2cf80f9f5682667528d9f" |
15 | SRCREV_meta ?= "96ea2660bb97e15f48f4885b9e436f24c3606bd9" | 15 | SRCREV_meta ?= "96ea2660bb97e15f48f4885b9e436f24c3606bd9" |
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.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 2993ddc951..7b3aaa7fa0 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | |||
@@ -15,8 +15,8 @@ DEPENDS += "openssl-native util-linux-native" | |||
15 | KMETA = "kernel-meta" | 15 | KMETA = "kernel-meta" |
16 | KCONF_BSP_AUDIT_LEVEL = "2" | 16 | KCONF_BSP_AUDIT_LEVEL = "2" |
17 | 17 | ||
18 | SRCREV_machine:qemuarm ?= "da9808c1a36f935dec2b90fb5fa5f9df4ff400a3" | 18 | SRCREV_machine:qemuarm ?= "bff12aa9748d83efc518e524858913c028f0707a" |
19 | SRCREV_machine ?= "bf0ae2ab0102a68bad4a586fd42ceb78cc0a24e1" | 19 | SRCREV_machine ?= "5bdf36bd73803640ee495fc6f36b0207993bf62a" |
20 | SRCREV_meta ?= "96ea2660bb97e15f48f4885b9e436f24c3606bd9" | 20 | SRCREV_meta ?= "96ea2660bb97e15f48f4885b9e436f24c3606bd9" |
21 | 21 | ||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index b1c991f55b..d5bf2c9496 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb | |||
@@ -13,16 +13,16 @@ KBRANCH:qemux86 ?= "v5.10/standard/base" | |||
13 | KBRANCH:qemux86-64 ?= "v5.10/standard/base" | 13 | KBRANCH:qemux86-64 ?= "v5.10/standard/base" |
14 | KBRANCH:qemumips64 ?= "v5.10/standard/mti-malta64" | 14 | KBRANCH:qemumips64 ?= "v5.10/standard/mti-malta64" |
15 | 15 | ||
16 | SRCREV_machine:qemuarm ?= "859babe91947ce09d70f8be4c8b314d9712a30ea" | 16 | SRCREV_machine:qemuarm ?= "8d513bf2294b60cbfa7bfbfab43f7ec458e88de0" |
17 | SRCREV_machine:qemuarm64 ?= "0a59ce2115693d52b931b0fc72f5699a22a77e81" | 17 | SRCREV_machine:qemuarm64 ?= "f86e70ec0a39fa6cfd5b19a013703345cf9e8d4c" |
18 | SRCREV_machine:qemumips ?= "5bebdf68c5391f8a56f98a8cb31522c0627e05e0" | 18 | SRCREV_machine:qemumips ?= "a5c1977699a2733ed4ddd08f1bcc1cbcc1fa8862" |
19 | SRCREV_machine:qemuppc ?= "0f4a4f1329c7331a02d36f7195f9414e40709d43" | 19 | SRCREV_machine:qemuppc ?= "2e52a4c55beaea77e6b99720de58624c416e7569" |
20 | SRCREV_machine:qemuriscv64 ?= "a6e419710dedbe0390cbf30267c13752b9161972" | 20 | SRCREV_machine:qemuriscv64 ?= "2883e69e202dc7948c99a7828e192b2b42c2d90a" |
21 | SRCREV_machine:qemuriscv32 ?= "a6e419710dedbe0390cbf30267c13752b9161972" | 21 | SRCREV_machine:qemuriscv32 ?= "2883e69e202dc7948c99a7828e192b2b42c2d90a" |
22 | SRCREV_machine:qemux86 ?= "a6e419710dedbe0390cbf30267c13752b9161972" | 22 | SRCREV_machine:qemux86 ?= "2883e69e202dc7948c99a7828e192b2b42c2d90a" |
23 | SRCREV_machine:qemux86-64 ?= "a6e419710dedbe0390cbf30267c13752b9161972" | 23 | SRCREV_machine:qemux86-64 ?= "2883e69e202dc7948c99a7828e192b2b42c2d90a" |
24 | SRCREV_machine:qemumips64 ?= "03dc9bc06ba1b7d105467bea334e84b3666b67f4" | 24 | SRCREV_machine:qemumips64 ?= "37c7c3e8979a2b0eb75bf8ceab7f2b7f12565ceb" |
25 | SRCREV_machine ?= "a6e419710dedbe0390cbf30267c13752b9161972" | 25 | SRCREV_machine ?= "2883e69e202dc7948c99a7828e192b2b42c2d90a" |
26 | SRCREV_meta ?= "96ea2660bb97e15f48f4885b9e436f24c3606bd9" | 26 | SRCREV_meta ?= "96ea2660bb97e15f48f4885b9e436f24c3606bd9" |
27 | 27 | ||
28 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ | 28 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ |