summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-11-19 14:17:50 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-03 23:02:08 +0000
commite46465c718d9e46e09fc12b95651946bd894cf8a (patch)
treee0ccafc724e7f4a9cec2a88d25e40ba1d6708762 /meta
parente4156f232b7c3c9fcb7869a7786d9670eb097012 (diff)
downloadpoky-e46465c718d9e46e09fc12b95651946bd894cf8a.tar.gz
linux-yocto/5.8: 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.8: 52b840afae05 perf: Alias SYS_futex with SYS_futex_time64 on 32-bit arches with 64bit time_t (From OE-Core rev: fbcd54a3db79e85aa1180523ca2903bf03ff7462) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 41135c844af1165b1e74e8e2654784f3cd4def8b) Signed-off-by: Anuj Mittal <anuj.mittal@intel.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.8.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.8.bb18
3 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb
index 203ddf6684..c2d627acb7 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.8.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
14SRCREV_machine ?= "64fd51cbe98ae4a0e05e59ed9abd9135f1b4cf64" 14SRCREV_machine ?= "52b840afae058fb20ce69ff5af811f8582b3bb5a"
15SRCREV_meta ?= "7883b60d324029d26020c0b3f826b35c52fd9674" 15SRCREV_meta ?= "7883b60d324029d26020c0b3f826b35c52fd9674"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb
index f37f525cc3..31a84f3972 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb
@@ -15,8 +15,8 @@ DEPENDS += "openssl-native util-linux-native"
15KMETA = "kernel-meta" 15KMETA = "kernel-meta"
16KCONF_BSP_AUDIT_LEVEL = "2" 16KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine_qemuarm ?= "aa614dcf182db126013b255968ab125afd96eb88" 18SRCREV_machine_qemuarm ?= "3e9aa72b02cf7d04096e367c99d503cd1d26cc6c"
19SRCREV_machine ?= "64fd51cbe98ae4a0e05e59ed9abd9135f1b4cf64" 19SRCREV_machine ?= "52b840afae058fb20ce69ff5af811f8582b3bb5a"
20SRCREV_meta ?= "7883b60d324029d26020c0b3f826b35c52fd9674" 20SRCREV_meta ?= "7883b60d324029d26020c0b3f826b35c52fd9674"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.8.bb b/meta/recipes-kernel/linux/linux-yocto_5.8.bb
index c0cdffce73..c6fb9e9f86 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.8.bb
@@ -12,15 +12,15 @@ KBRANCH_qemux86 ?= "v5.8/standard/base"
12KBRANCH_qemux86-64 ?= "v5.8/standard/base" 12KBRANCH_qemux86-64 ?= "v5.8/standard/base"
13KBRANCH_qemumips64 ?= "v5.8/standard/mti-malta64" 13KBRANCH_qemumips64 ?= "v5.8/standard/mti-malta64"
14 14
15SRCREV_machine_qemuarm ?= "cd6c8c74317d2f9504c25e28e37f4140deec2d19" 15SRCREV_machine_qemuarm ?= "0c6d276c75233f9b8d05103ff652676a2c271868"
16SRCREV_machine_qemuarm64 ?= "64fd51cbe98ae4a0e05e59ed9abd9135f1b4cf64" 16SRCREV_machine_qemuarm64 ?= "52b840afae058fb20ce69ff5af811f8582b3bb5a"
17SRCREV_machine_qemumips ?= "c610a204d0821f5abc253e72894fd32b41b92db3" 17SRCREV_machine_qemumips ?= "4c07d59936f8e28eadecab8f56ef14726f77ccb8"
18SRCREV_machine_qemuppc ?= "64fd51cbe98ae4a0e05e59ed9abd9135f1b4cf64" 18SRCREV_machine_qemuppc ?= "52b840afae058fb20ce69ff5af811f8582b3bb5a"
19SRCREV_machine_qemuriscv64 ?= "64fd51cbe98ae4a0e05e59ed9abd9135f1b4cf64" 19SRCREV_machine_qemuriscv64 ?= "52b840afae058fb20ce69ff5af811f8582b3bb5a"
20SRCREV_machine_qemux86 ?= "64fd51cbe98ae4a0e05e59ed9abd9135f1b4cf64" 20SRCREV_machine_qemux86 ?= "52b840afae058fb20ce69ff5af811f8582b3bb5a"
21SRCREV_machine_qemux86-64 ?= "64fd51cbe98ae4a0e05e59ed9abd9135f1b4cf64" 21SRCREV_machine_qemux86-64 ?= "52b840afae058fb20ce69ff5af811f8582b3bb5a"
22SRCREV_machine_qemumips64 ?= "86cc0d9a3f6751ada12fa4630b3e3c23221d6da7" 22SRCREV_machine_qemumips64 ?= "2224bf83cf372bb729583dfb93ad28abba9905fd"
23SRCREV_machine ?= "64fd51cbe98ae4a0e05e59ed9abd9135f1b4cf64" 23SRCREV_machine ?= "52b840afae058fb20ce69ff5af811f8582b3bb5a"
24SRCREV_meta ?= "7883b60d324029d26020c0b3f826b35c52fd9674" 24SRCREV_meta ?= "7883b60d324029d26020c0b3f826b35c52fd9674"
25 25
26# remap qemuarm to qemuarma15 for the 5.8 kernel 26# remap qemuarm to qemuarma15 for the 5.8 kernel