diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-08-24 10:59:59 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-28 10:27:15 +0100 |
| commit | e12f9e7ede7eea408d6a97233c7c8df97e8bfb26 (patch) | |
| tree | e29357fbd61819669c8f460f4787c1cb414741e1 | |
| parent | c36a5e21b711cd577a2186a5267d46bb4323acc1 (diff) | |
| download | openembedded-core-e12f9e7ede7eea408d6a97233c7c8df97e8bfb26.tar.gz openembedded-core-e12f9e7ede7eea408d6a97233c7c8df97e8bfb26.tar.bz2 openembedded-core-e12f9e7ede7eea408d6a97233c7c8df97e8bfb26.zip | |
qemu/bsp: update 4.15 preferred versions to 4.18
4.18 is replacing 4.15 as the latest kernel in the upcoming
release, so we update our preferred versions to match.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 06de778b5b..c29279209b 100644 --- a/meta/conf/machine/include/x86-base.inc +++ b/meta/conf/machine/include/x86-base.inc @@ -18,7 +18,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0" # kernel-related variables # PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" -PREFERRED_VERSION_linux-yocto ??= "4.15%" +PREFERRED_VERSION_linux-yocto ??= "4.18%" # # XSERVER subcomponents, used to build the XSERVER variable diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 9403b1e7e3..d2f2c85c3f 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.15%" +PREFERRED_VERSION_linux-yocto ??= "4.18%" QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" |