diff options
| author |   Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-08-20 22:58:20 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-23 08:47:05 +0100 |
| commit | c58df63d88a07d3275e7337f7d284b0a50db82cc (patch) | |
| tree | da4d1ef2e0db82ad6a50e2f610df90f2b5e6602b | |
| parent | 4b5cce1c691e991c80d255a4900220068ff6f062 (diff) | |
| download | openembedded-core-contrib-c58df63d88a07d3275e7337f7d284b0a50db82cc.tar.gz | |
qemu: bump default version to 4.12
Not all the qemu machines carry default kernel specifications.
While we could drop these references, we'll bump them to 4.12
to pick up the latest and remove them in future commits.
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 bc0c27b73e..023eb5ecca 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.10%" +PREFERRED_VERSION_linux-yocto ??= "4.12%" # # XSERVER subcomponents, used to build the XSERVER variable diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 1f0a65f291..c8932ddc59 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.10%" +PREFERRED_VERSION_linux-yocto ??= "4.12%" QB_DTB = "${@base_version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" |