diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-07-13 14:33:22 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-14 23:22:10 +0100 |
commit | 6c91fe738308acbedd19627a8d8b5d6c6319bf9e (patch) | |
tree | 969584f104b2ffbae9851d121733ee4fa00ddf93 /meta/recipes-kernel | |
parent | d20b52121f2fe4273a39b5accbe794e434322f5f (diff) | |
download | poky-6c91fe738308acbedd19627a8d8b5d6c6319bf9e.tar.gz |
linux-yocto/5.10: fix buildpaths issue with gen-mach-types
Integrating the following commit(s) to linux-yocto/5.10:
80f5207b5abd tools: use basename to identify file in gen-mach-types
(From OE-Core rev: 78dbf81b9951b1b49ec1546d6eb9ed7240507515)
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 a695740976..c705b7c07a 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 ?= "f481ff6adf4be55c3ab89d0cf7243bbca69205c9" | 14 | SRCREV_machine ?= "2f72685aa16ee5e1c8c53df03457b223a6996540" |
15 | SRCREV_meta ?= "2f79722c50ad61cf055b40e8ba6d6f48e8dc6db0" | 15 | SRCREV_meta ?= "2f79722c50ad61cf055b40e8ba6d6f48e8dc6db0" |
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 41cad3d37e..6336ef544f 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 ?= "cab1bb0e702f93b16762fc560d6be582fbf86a6a" | 18 | SRCREV_machine:qemuarm ?= "3b951d9995d83be4e2985d6aa904d59cb9ac7692" |
19 | SRCREV_machine ?= "5239dc7bbd53a3d4d5e31f8631612c2eb6cee0b8" | 19 | SRCREV_machine ?= "f2b78db2b548501a7b0b17f76b9ee2f09978fb30" |
20 | SRCREV_meta ?= "2f79722c50ad61cf055b40e8ba6d6f48e8dc6db0" | 20 | SRCREV_meta ?= "2f79722c50ad61cf055b40e8ba6d6f48e8dc6db0" |
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 fbee1874f4..96c77e6a87 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 ?= "952586297dec710cba21ccf7f6fe4a1aadde0a5d" | 16 | SRCREV_machine:qemuarm ?= "8b54878acc1161bdcfa3a1153cb2fff39c675b89" |
17 | SRCREV_machine:qemuarm64 ?= "268aa738ea2454a1293dcb6c829c88552a5768d2" | 17 | SRCREV_machine:qemuarm64 ?= "2db48159f4444dcfa0c0dab5804769ea528bb6ed" |
18 | SRCREV_machine:qemumips ?= "bb9cabbe92165b556329cb0eed12ab67d2dee7a7" | 18 | SRCREV_machine:qemumips ?= "fc5fb9c35b8c52a3b1b2348a56237b6f1bb7fc6b" |
19 | SRCREV_machine:qemuppc ?= "88ee9e4c24d32b6d0ec90756f0c7729954d3feae" | 19 | SRCREV_machine:qemuppc ?= "736b1667a61f21d7a1b8c88e8cedb648e79e687b" |
20 | SRCREV_machine:qemuriscv64 ?= "4d201ec392f149ecce321186ea5494a6e25e28f4" | 20 | SRCREV_machine:qemuriscv64 ?= "80f5207b5abddf0dae8eeaa5e3bcfe0e23538e62" |
21 | SRCREV_machine:qemuriscv32 ?= "4d201ec392f149ecce321186ea5494a6e25e28f4" | 21 | SRCREV_machine:qemuriscv32 ?= "80f5207b5abddf0dae8eeaa5e3bcfe0e23538e62" |
22 | SRCREV_machine:qemux86 ?= "4d201ec392f149ecce321186ea5494a6e25e28f4" | 22 | SRCREV_machine:qemux86 ?= "80f5207b5abddf0dae8eeaa5e3bcfe0e23538e62" |
23 | SRCREV_machine:qemux86-64 ?= "4d201ec392f149ecce321186ea5494a6e25e28f4" | 23 | SRCREV_machine:qemux86-64 ?= "80f5207b5abddf0dae8eeaa5e3bcfe0e23538e62" |
24 | SRCREV_machine:qemumips64 ?= "1a760ff71146a87cb5b7de87aed88db07a907ef1" | 24 | SRCREV_machine:qemumips64 ?= "2105a97021e3d0c565d84947e5cd45dd77be07e3" |
25 | SRCREV_machine ?= "4d201ec392f149ecce321186ea5494a6e25e28f4" | 25 | SRCREV_machine ?= "80f5207b5abddf0dae8eeaa5e3bcfe0e23538e62" |
26 | SRCREV_meta ?= "2f79722c50ad61cf055b40e8ba6d6f48e8dc6db0" | 26 | SRCREV_meta ?= "2f79722c50ad61cf055b40e8ba6d6f48e8dc6db0" |
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}; \ |