From 89c4bd0dfb69572fb5e42b467cdf1acc220e5775 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 6 Feb 2018 11:22:00 -0500 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/conf/machine/include/x86-base.inc | 2 +- meta/conf/machine/qemuarm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/conf') 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" # kernel-related variables # PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" -PREFERRED_VERSION_linux-yocto ??= "4.12%" +PREFERRED_VERSION_linux-yocto ??= "4.15%" # # 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" QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet -device virtio-rng-pci" -PREFERRED_VERSION_linux-yocto ??= "4.12%" +PREFERRED_VERSION_linux-yocto ??= "4.15%" QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" -- cgit v1.2.3-54-g00ecf