diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-02-21 12:45:58 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-22 23:57:26 +0000 |
commit | f55a12702b43762a093539b04c66f55df7c187ab (patch) | |
tree | 42add5e04113b8ce01ff051d5e3f7eaa13f7f528 /meta/recipes-kernel | |
parent | a8fa7a3f40e14ab3d8592d8bedf07dfb8e7cb70e (diff) | |
download | poky-f55a12702b43762a093539b04c66f55df7c187ab.tar.gz |
linux-yocto/5.4: integrate mips64 multlib/32bit VDSO fix
Bumping the SRCREVs to pickup the VDSO fix by Victor Kamensky. We
need it to avoid segfaults in SDK testing as well as the standard
mips image test cases.
(From OE-Core rev: 8dfaf1abe9f2292b5c357a62d6fa4c0660a5c47c)
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.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.4.bb | 18 |
3 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index ab93f1bf55..94a8e052e7 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.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 ?= "a9334277f632a96eca9d037e9bc077a855d0908d" | 14 | SRCREV_machine ?= "2f533134cfb54b0f77e39a9a9108836aafc3eea1" |
15 | SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" | 15 | SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" |
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.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 097357d9c0..622f5e60c0 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.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 ?= "3805e4f98313c4a4c64ffdb06b6401de8746fe45" | 18 | SRCREV_machine_qemuarm ?= "b73dad53d5bfa6b53f56a9022dd9f965d47c93e2" |
19 | SRCREV_machine ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" | 19 | SRCREV_machine ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" |
20 | SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" | 20 | SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" |
21 | 21 | ||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index 0b2a2305f1..feb89780ea 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb | |||
@@ -12,15 +12,15 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" | |||
12 | KBRANCH_qemux86-64 ?= "v5.4/standard/base" | 12 | KBRANCH_qemux86-64 ?= "v5.4/standard/base" |
13 | KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" | 13 | KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" |
14 | 14 | ||
15 | SRCREV_machine_qemuarm ?= "0eb0f3620fc93699d1d8adafa2b07174733c7c98" | 15 | SRCREV_machine_qemuarm ?= "65ea2729e3e6a8db8512a80a9838a975ca38f1b3" |
16 | SRCREV_machine_qemuarm64 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" | 16 | SRCREV_machine_qemuarm64 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" |
17 | SRCREV_machine_qemumips ?= "933d80248406c58efdfe32d130479f59d56727be" | 17 | SRCREV_machine_qemumips ?= "75b3ff96ee76cdfbf5320ddf97b1c929bb8400c8" |
18 | SRCREV_machine_qemuppc ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" | 18 | SRCREV_machine_qemuppc ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" |
19 | SRCREV_machine_qemuriscv64 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" | 19 | SRCREV_machine_qemuriscv64 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" |
20 | SRCREV_machine_qemux86 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" | 20 | SRCREV_machine_qemux86 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" |
21 | SRCREV_machine_qemux86-64 ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" | 21 | SRCREV_machine_qemux86-64 ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" |
22 | SRCREV_machine_qemumips64 ?= "db201874e886742eb7a5adf450f5be1293fb83c2" | 22 | SRCREV_machine_qemumips64 ?= "419af24bb95f01a2106b7cf25b0adc965368d486" |
23 | SRCREV_machine ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" | 23 | SRCREV_machine ?= "239eea7ef5dd5ec7ce6712ea6fc8e9ba9bd49ece" |
24 | SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" | 24 | SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" |
25 | 25 | ||
26 | # remap qemuarm to qemuarma15 for the 5.4 kernel | 26 | # remap qemuarm to qemuarma15 for the 5.4 kernel |