diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-07-14 15:14:50 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-15 08:21:42 +0100 |
commit | fd883811e9a9e5f855d18d718ccc0f1e6406baf3 (patch) | |
tree | a5a534168b1d5715eb4ff69690897990d2720885 /meta/recipes-kernel | |
parent | 576c44da179ba57cfa63eb32b8f9b723bd0a613f (diff) | |
download | poky-fd883811e9a9e5f855d18d718ccc0f1e6406baf3.tar.gz |
linux-yocto/5.15: fix buildpaths issue with pnmtologo
Integrating the following commit(s) to linux-yocto/5.15:
a40d2daf2795 pnmtologo: use relocatable file name
(From OE-Core rev: 3c2bd1b975b05df30af21475b33aaf3d6fb192e6)
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.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 0cac752eba..b6e443d4da 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 ?= "3a0e5a16b0c30008959538258553ca70f33ff2fc" | 14 | SRCREV_machine ?= "0222cbb8d40318cf5377875017e32eebefa59ab8" |
15 | SRCREV_meta ?= "0e3a81a5aefbea03388b1235fbcc3dec278425d0" | 15 | SRCREV_meta ?= "0e3a81a5aefbea03388b1235fbcc3dec278425d0" |
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 3a35c1e44c..aadf014463 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 ?= "e7447cb9afee4a22b0d3102922c3430eeb44bcc3" | 17 | SRCREV_machine ?= "9b1d0e5eb8b08323577f5e2b21cbb2065aba0aa1" |
18 | SRCREV_meta ?= "0e3a81a5aefbea03388b1235fbcc3dec278425d0" | 18 | SRCREV_meta ?= "0e3a81a5aefbea03388b1235fbcc3dec278425d0" |
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 0b499b29ff..4c1d163a1e 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 ?= "e12b73a556e5cbd2c5cb157aba0d84e2c3be1ddf" | 16 | SRCREV_machine:qemuarm ?= "c284142affccb534122ad93bdcd4774af161d767" |
17 | SRCREV_machine:qemuarm64 ?= "b1f3c7dddb39848a5b6bae9f6490927bf090de84" | 17 | SRCREV_machine:qemuarm64 ?= "c4c194a34c568c17389120608b2ee8a7a988150a" |
18 | SRCREV_machine:qemumips ?= "aa4bd512de00a1054205069ac334d97f82564b1e" | 18 | SRCREV_machine:qemumips ?= "7b446965d9659d312952ef4dedf5b50a493e60c2" |
19 | SRCREV_machine:qemuppc ?= "fcd84bc0d01c29fe94f736812ef58978c57d6836" | 19 | SRCREV_machine:qemuppc ?= "0c2a4ad856c8f0c1b3ca8a38c17e1194f47e4643" |
20 | SRCREV_machine:qemuriscv64 ?= "d81d20a55992c55475d7b5570589cd5884059147" | 20 | SRCREV_machine:qemuriscv64 ?= "a40d2daf2795d89e3ef8af0413b25190558831ec" |
21 | SRCREV_machine:qemuriscv32 ?= "d81d20a55992c55475d7b5570589cd5884059147" | 21 | SRCREV_machine:qemuriscv32 ?= "a40d2daf2795d89e3ef8af0413b25190558831ec" |
22 | SRCREV_machine:qemux86 ?= "d81d20a55992c55475d7b5570589cd5884059147" | 22 | SRCREV_machine:qemux86 ?= "a40d2daf2795d89e3ef8af0413b25190558831ec" |
23 | SRCREV_machine:qemux86-64 ?= "d81d20a55992c55475d7b5570589cd5884059147" | 23 | SRCREV_machine:qemux86-64 ?= "a40d2daf2795d89e3ef8af0413b25190558831ec" |
24 | SRCREV_machine:qemumips64 ?= "694134b0fceb27051d3b0cfccc7ba0649319aa7e" | 24 | SRCREV_machine:qemumips64 ?= "9a8d4e00df67daf224ae62b238c151a3f3f70ae7" |
25 | SRCREV_machine ?= "d81d20a55992c55475d7b5570589cd5884059147" | 25 | SRCREV_machine ?= "a40d2daf2795d89e3ef8af0413b25190558831ec" |
26 | SRCREV_meta ?= "0e3a81a5aefbea03388b1235fbcc3dec278425d0" | 26 | SRCREV_meta ?= "0e3a81a5aefbea03388b1235fbcc3dec278425d0" |
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 |