summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2019-01-22 09:32:42 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-22 20:08:22 +0000
commitccad1dc80d4e2d402cc1a26a368a1a362964f0ce (patch)
treeb78d3e8e640acaf24a8f8a6be884d3817b87682b /meta
parenta91f5d096f4f7748b9acd5fdaa83b2fea91ebf93 (diff)
downloadpoky-ccad1dc80d4e2d402cc1a26a368a1a362964f0ce.tar.gz
linux-yocto/4.19: qemuarma15: drop 'qemuarm' match
Until qemuarma15 is a drop in replacement for the existing versatile qemuarm emulation, it shouldn't match on qemuarm as a machine definition. Since the difference in capabilities will cause unexpected issues at runtime. (From OE-Core rev: a56298f2d0f6590774e4e1454b85d7be301dfb44) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.19.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
index cb0283d49f..bfce9aa769 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
@@ -12,7 +12,7 @@ python () {
12} 12}
13 13
14SRCREV_machine ?= "7a0b04e5a8d036cd9dcc6ee64a838e8d8d5cdd56" 14SRCREV_machine ?= "7a0b04e5a8d036cd9dcc6ee64a838e8d8d5cdd56"
15SRCREV_meta ?= "0b9ea5596fd88277a4ecca1a8b8a1aca06a1ae37" 15SRCREV_meta ?= "7223248023d3d822c8c0227fb65d995ba6b7a351"
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 \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
index 4e13bf125e..c734ad8407 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine_qemuarm ?= "d11db6c6617f689e6b9e2afaa3d3b2036c6d3d30" 18SRCREV_machine_qemuarm ?= "d11db6c6617f689e6b9e2afaa3d3b2036c6d3d30"
19SRCREV_machine ?= "eebb51300a07804a020ec468b5f8c5bf720198d9" 19SRCREV_machine ?= "eebb51300a07804a020ec468b5f8c5bf720198d9"
20SRCREV_meta ?= "0b9ea5596fd88277a4ecca1a8b8a1aca06a1ae37" 20SRCREV_meta ?= "7223248023d3d822c8c0227fb65d995ba6b7a351"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
23 23
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb
index 599418d9cb..187437016f 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "eebb51300a07804a020ec468b5f8c5bf720198d9"
19SRCREV_machine_qemux86-64 ?= "eebb51300a07804a020ec468b5f8c5bf720198d9" 19SRCREV_machine_qemux86-64 ?= "eebb51300a07804a020ec468b5f8c5bf720198d9"
20SRCREV_machine_qemumips64 ?= "dff23f01307cbab688d9677ecd4b5f350ec435d9" 20SRCREV_machine_qemumips64 ?= "dff23f01307cbab688d9677ecd4b5f350ec435d9"
21SRCREV_machine ?= "eebb51300a07804a020ec468b5f8c5bf720198d9" 21SRCREV_machine ?= "eebb51300a07804a020ec468b5f8c5bf720198d9"
22SRCREV_meta ?= "0b9ea5596fd88277a4ecca1a8b8a1aca06a1ae37" 22SRCREV_meta ?= "7223248023d3d822c8c0227fb65d995ba6b7a351"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}"