diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-11-19 14:17:49 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-11-24 10:27:44 +0000 |
commit | 4c9eb508dbd3a18809533768ddca5a6eac80d461 (patch) | |
tree | db44599cf638f65e40274d0dc61e1866eea0b57b /meta | |
parent | 51c5cd66e1da16bd572de56a2b885cdb2116e189 (diff) | |
download | poky-4c9eb508dbd3a18809533768ddca5a6eac80d461.tar.gz |
linux-yocto/5.4: perf: Alias SYS_futex with SYS_futex_time64 on 32-bit arches with 64bit time_t
Integrating the following commit(s) to linux-yocto/5.4:
356914747645 perf: Alias SYS_futex with SYS_futex_time64 on 32-bit arches with 64bit time_t
(From OE-Core rev: 73ee256e5c1194ec5d0843dee274d29cc0efe993)
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.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 183acce226..4db2b33aef 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 ?= "e500e89811e268ab5c420744c41b10d12c9844a0" | 14 | SRCREV_machine ?= "1fe1ef9c7272caf75d92b3e9166a0f29c4f06141" |
15 | SRCREV_meta ?= "8d0ed83a864cc91eef4d2abbc90f13d4ecd1c213" | 15 | SRCREV_meta ?= "8d0ed83a864cc91eef4d2abbc90f13d4ecd1c213" |
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 f6190be8da..f6ed7f35ea 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 ?= "2c7da912c6b5bd36d84f75e0aff4afd0814f1bd3" | 18 | SRCREV_machine_qemuarm ?= "83d064534da33ab41108a786d917068f282a9bf2" |
19 | SRCREV_machine ?= "d0096198f08dd2aa4222ef5480d2fcdaf520b65b" | 19 | SRCREV_machine ?= "356914747645db5ceba98b22acdfa060ef1764af" |
20 | SRCREV_meta ?= "8d0ed83a864cc91eef4d2abbc90f13d4ecd1c213" | 20 | SRCREV_meta ?= "8d0ed83a864cc91eef4d2abbc90f13d4ecd1c213" |
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 23fc5ea819..0330a9d159 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 ?= "dbac8d2939bca0a92226cfd55543331715dd642d" | 15 | SRCREV_machine_qemuarm ?= "879db1ae1856cf5a9fe4609fdbcbe2e3c7bade5f" |
16 | SRCREV_machine_qemuarm64 ?= "d0096198f08dd2aa4222ef5480d2fcdaf520b65b" | 16 | SRCREV_machine_qemuarm64 ?= "356914747645db5ceba98b22acdfa060ef1764af" |
17 | SRCREV_machine_qemumips ?= "819cf265755f21768f6bb98312cb568c6db8b1e8" | 17 | SRCREV_machine_qemumips ?= "190c3ce9c2dbc709c3dcf02d8cfa80adc8a063d2" |
18 | SRCREV_machine_qemuppc ?= "d0096198f08dd2aa4222ef5480d2fcdaf520b65b" | 18 | SRCREV_machine_qemuppc ?= "356914747645db5ceba98b22acdfa060ef1764af" |
19 | SRCREV_machine_qemuriscv64 ?= "d0096198f08dd2aa4222ef5480d2fcdaf520b65b" | 19 | SRCREV_machine_qemuriscv64 ?= "356914747645db5ceba98b22acdfa060ef1764af" |
20 | SRCREV_machine_qemux86 ?= "d0096198f08dd2aa4222ef5480d2fcdaf520b65b" | 20 | SRCREV_machine_qemux86 ?= "356914747645db5ceba98b22acdfa060ef1764af" |
21 | SRCREV_machine_qemux86-64 ?= "d0096198f08dd2aa4222ef5480d2fcdaf520b65b" | 21 | SRCREV_machine_qemux86-64 ?= "356914747645db5ceba98b22acdfa060ef1764af" |
22 | SRCREV_machine_qemumips64 ?= "bb9110d96ce8a2c56466e5b4314b93175af3d80d" | 22 | SRCREV_machine_qemumips64 ?= "98b1fc2eafc28e5c198e23579e38a76626c66182" |
23 | SRCREV_machine ?= "d0096198f08dd2aa4222ef5480d2fcdaf520b65b" | 23 | SRCREV_machine ?= "356914747645db5ceba98b22acdfa060ef1764af" |
24 | SRCREV_meta ?= "8d0ed83a864cc91eef4d2abbc90f13d4ecd1c213" | 24 | SRCREV_meta ?= "8d0ed83a864cc91eef4d2abbc90f13d4ecd1c213" |
25 | 25 | ||
26 | # remap qemuarm to qemuarma15 for the 5.4 kernel | 26 | # remap qemuarm to qemuarma15 for the 5.4 kernel |