summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2018-02-06 11:22:00 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-15 11:23:11 +0000
commit89c4bd0dfb69572fb5e42b467cdf1acc220e5775 (patch)
treece835d60958ef393d02aa4878b426c70924271a9
parent3916259f9aee07cfe0bf9abc640802e374840e45 (diff)
downloadpoky-89c4bd0dfb69572fb5e42b467cdf1acc220e5775.tar.gz
machines: bump default linux-yocto to v4.15
Ensure that the qemu* machines are building the latest available kernel in master. (From OE-Core rev: 3980f21a74ad201d8cb8f5ef6fb732fdfacd641f) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/machine/include/x86-base.inc2
-rw-r--r--meta/conf/machine/qemuarm.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/machine/include/x86-base.inc b/meta/conf/machine/include/x86-base.inc
index 023eb5ecca..f8aacea64c 100644
--- a/meta/conf/machine/include/x86-base.inc
+++ b/meta/conf/machine/include/x86-base.inc
@@ -21,7 +21,7 @@ SERIAL_CONSOLE ?= "115200 ttyS0"
21# kernel-related variables 21# kernel-related variables
22# 22#
23PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" 23PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto"
24PREFERRED_VERSION_linux-yocto ??= "4.12%" 24PREFERRED_VERSION_linux-yocto ??= "4.15%"
25 25
26# 26#
27# XSERVER subcomponents, used to build the XSERVER variable 27# XSERVER subcomponents, used to build the XSERVER variable
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index aa112f5140..9403b1e7e3 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -16,5 +16,5 @@ QB_MACHINE = "-machine versatilepb"
16QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" 16QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty"
17# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy 17# Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy
18QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet -device virtio-rng-pci" 18QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet -device virtio-rng-pci"
19PREFERRED_VERSION_linux-yocto ??= "4.12%" 19PREFERRED_VERSION_linux-yocto ??= "4.15%"
20QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" 20QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}"