diff options
| author |   Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-02-06 11:22:00 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-09 14:32:00 +0000 |
| commit | 3980f21a74ad201d8cb8f5ef6fb732fdfacd641f (patch) | |
| tree | 33562ee7f17e5122ec6a04bd74eef11593cb3b6d /meta/conf | |
| parent | fcac38960af535f3b165f862dd5f4dbca43976a7 (diff) | |
| download | openembedded-core-3980f21a74ad201d8cb8f5ef6fb732fdfacd641f.tar.gz | |
machines: bump default linux-yocto to v4.15
Ensure that the qemu* machines are building the latest available
kernel in master.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/machine/include/x86-base.inc | 2 | ||||
| -rw-r--r-- | meta/conf/machine/qemuarm.conf | 2 |
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" # 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)}" |