summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-10-06 15:04:28 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-10-07 10:18:55 +0100
commitcdaf69b1d1963df559be8b4177e540f41a650220 (patch)
treebad4b9267ff03cf1393d4d4dfe7189498b2443d3 /meta/recipes-kernel
parentb534c8f338ac979811ecda192d52fbc18e371808 (diff)
downloadpoky-cdaf69b1d1963df559be8b4177e540f41a650220.tar.gz
linux-yocto/5.4: fix kprobes build warning
Integrating the following commit(s) to linux-yocto/5.4: 178189d65780 kprobes: Fix compiler warning for !CONFIG_KPROBES_ON_FTRACE (From OE-Core rev: aa2b309a938f4af5f5d95bc7e7f3c0e9d77f3dd3) 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.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.4.bb18
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 eded625bff..f5b61306b1 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
14SRCREV_machine ?= "1d9e25c4f35155580cef313ff2a76de545124a1d" 14SRCREV_machine ?= "7845a542e9defb056524ac7b362a9fd2eb3fd0c7"
15SRCREV_meta ?= "0d860e075788a92601dff3eb9b615ee41e465040" 15SRCREV_meta ?= "0d860e075788a92601dff3eb9b615ee41e465040"
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.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
index 853fc93694..c6e5bff052 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"
15KMETA = "kernel-meta" 15KMETA = "kernel-meta"
16KCONF_BSP_AUDIT_LEVEL = "2" 16KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine_qemuarm ?= "bb77791bc00cfa70211dd238d312b4db950c0808" 18SRCREV_machine_qemuarm ?= "c7da9d62e37698db556ccb45f20b6a7953769793"
19SRCREV_machine ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" 19SRCREV_machine ?= "178189d65780e9526bcd9e47d3cd9ea6ecb8f47a"
20SRCREV_meta ?= "0d860e075788a92601dff3eb9b615ee41e465040" 20SRCREV_meta ?= "0d860e075788a92601dff3eb9b615ee41e465040"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${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 d06d653d71..ad963bb5d1 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"
12KBRANCH_qemux86-64 ?= "v5.4/standard/base" 12KBRANCH_qemux86-64 ?= "v5.4/standard/base"
13KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" 13KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64"
14 14
15SRCREV_machine_qemuarm ?= "894e63d3256613faa39931a6ae505cfd196df067" 15SRCREV_machine_qemuarm ?= "ea89b3a28f6a28c4c158ca3d64c2df4dd68321ed"
16SRCREV_machine_qemuarm64 ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" 16SRCREV_machine_qemuarm64 ?= "178189d65780e9526bcd9e47d3cd9ea6ecb8f47a"
17SRCREV_machine_qemumips ?= "aa13fdb2c5f8c4e4e432bfee6df9c8f76ec8ac70" 17SRCREV_machine_qemumips ?= "d1f9cfb34040a4fc2d7a6827a27893aaa6b434e6"
18SRCREV_machine_qemuppc ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" 18SRCREV_machine_qemuppc ?= "178189d65780e9526bcd9e47d3cd9ea6ecb8f47a"
19SRCREV_machine_qemuriscv64 ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" 19SRCREV_machine_qemuriscv64 ?= "178189d65780e9526bcd9e47d3cd9ea6ecb8f47a"
20SRCREV_machine_qemux86 ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" 20SRCREV_machine_qemux86 ?= "178189d65780e9526bcd9e47d3cd9ea6ecb8f47a"
21SRCREV_machine_qemux86-64 ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" 21SRCREV_machine_qemux86-64 ?= "178189d65780e9526bcd9e47d3cd9ea6ecb8f47a"
22SRCREV_machine_qemumips64 ?= "4fb21d604fc54db63221ea28ab90622c29d74202" 22SRCREV_machine_qemumips64 ?= "362db79de010ca86e7e75fa468083ffbd6006e54"
23SRCREV_machine ?= "406008bf3232dfc9e63b6e7bf745ca883c45041e" 23SRCREV_machine ?= "178189d65780e9526bcd9e47d3cd9ea6ecb8f47a"
24SRCREV_meta ?= "0d860e075788a92601dff3eb9b615ee41e465040" 24SRCREV_meta ?= "0d860e075788a92601dff3eb9b615ee41e465040"
25 25
26# remap qemuarm to qemuarma15 for the 5.4 kernel 26# remap qemuarm to qemuarma15 for the 5.4 kernel