diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-07-12 10:38:11 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-12 23:56:10 +0100 |
commit | 981b711405a0908274e2e7185d030b3c7301e920 (patch) | |
tree | bb926106b53a02b1e0bb8ea73d14553153b7bf9a /meta | |
parent | 666a30a5beb0c201a34ed359cd06de427ecaebf1 (diff) | |
download | poky-981b711405a0908274e2e7185d030b3c7301e920.tar.gz |
linux-yocto/5.10: fix build_OID_registry/conmakehash buildpaths warning
Integrating the following commit(s) to linux-yocto/5.10:
4d201ec392f1 vt/conmakehash: improve reproducibility
ae24d013888f lib/build_OID_registry: fix reproducibility issues
(From OE-Core rev: db22dbc1f66d2f76dab719597986cfd96cf18d71)
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.10.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.10.bb | 22 |
3 files changed, 16 insertions, 16 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 75868eb3d1..a695740976 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | |||
@@ -11,8 +11,8 @@ 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 ?= "b54fa6bf849eca66798bb59d0632b76475e5ef98" | 14 | SRCREV_machine ?= "f481ff6adf4be55c3ab89d0cf7243bbca69205c9" |
15 | SRCREV_meta ?= "5b3dacac6fe3c01c9df223897224c2367a5d20c0" | 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 \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" |
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 15e03c653a..41cad3d37e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | |||
@@ -15,9 +15,9 @@ 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 ?= "fb53532e7f97426df28a91c56beff034b2487c21" | 18 | SRCREV_machine:qemuarm ?= "cab1bb0e702f93b16762fc560d6be582fbf86a6a" |
19 | SRCREV_machine ?= "953ea081e524baca7401da7cdf6aab5482cf9fb7" | 19 | SRCREV_machine ?= "5239dc7bbd53a3d4d5e31f8631612c2eb6cee0b8" |
20 | SRCREV_meta ?= "5b3dacac6fe3c01c9df223897224c2367a5d20c0" | 20 | SRCREV_meta ?= "2f79722c50ad61cf055b40e8ba6d6f48e8dc6db0" |
21 | 21 | ||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
23 | 23 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index e143616db9..fbee1874f4 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb | |||
@@ -13,17 +13,17 @@ 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 ?= "b0120b4ab3e79e53b9526fcb888a0fa7fb26b290" | 16 | SRCREV_machine:qemuarm ?= "952586297dec710cba21ccf7f6fe4a1aadde0a5d" |
17 | SRCREV_machine:qemuarm64 ?= "cb4d26c271f026d51c2944cd8e42e484707d760c" | 17 | SRCREV_machine:qemuarm64 ?= "268aa738ea2454a1293dcb6c829c88552a5768d2" |
18 | SRCREV_machine:qemumips ?= "cdec08a50503179be1b3ab5120617ef11345817c" | 18 | SRCREV_machine:qemumips ?= "bb9cabbe92165b556329cb0eed12ab67d2dee7a7" |
19 | SRCREV_machine:qemuppc ?= "c0821a7ab5ccfd996ff3a30fc8359fb73ba4b123" | 19 | SRCREV_machine:qemuppc ?= "88ee9e4c24d32b6d0ec90756f0c7729954d3feae" |
20 | SRCREV_machine:qemuriscv64 ?= "c57efb0553276189e83d5c276255f576240a0720" | 20 | SRCREV_machine:qemuriscv64 ?= "4d201ec392f149ecce321186ea5494a6e25e28f4" |
21 | SRCREV_machine:qemuriscv32 ?= "c57efb0553276189e83d5c276255f576240a0720" | 21 | SRCREV_machine:qemuriscv32 ?= "4d201ec392f149ecce321186ea5494a6e25e28f4" |
22 | SRCREV_machine:qemux86 ?= "c57efb0553276189e83d5c276255f576240a0720" | 22 | SRCREV_machine:qemux86 ?= "4d201ec392f149ecce321186ea5494a6e25e28f4" |
23 | SRCREV_machine:qemux86-64 ?= "c57efb0553276189e83d5c276255f576240a0720" | 23 | SRCREV_machine:qemux86-64 ?= "4d201ec392f149ecce321186ea5494a6e25e28f4" |
24 | SRCREV_machine:qemumips64 ?= "43cc2c777b16ea5bb45bbae47b901c801c30dbb1" | 24 | SRCREV_machine:qemumips64 ?= "1a760ff71146a87cb5b7de87aed88db07a907ef1" |
25 | SRCREV_machine ?= "c57efb0553276189e83d5c276255f576240a0720" | 25 | SRCREV_machine ?= "4d201ec392f149ecce321186ea5494a6e25e28f4" |
26 | SRCREV_meta ?= "5b3dacac6fe3c01c9df223897224c2367a5d20c0" | 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}; \ |
29 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" | 29 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" |