diff options
| author |   Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-03-05 15:46:58 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-12 11:56:38 -0700 |
| commit | bb4f4a202d400fd1cf630c29f864d472258cc005 (patch) | |
| tree | 9d64e3339187d4e8c72212f35f1df02f95bfa553 /meta | |
| parent | c112be9643f9031964be4068feeb5e2f8528c107 (diff) | |
| download | openembedded-core-contrib-bb4f4a202d400fd1cf630c29f864d472258cc005.tar.gz | |
machine: bump preferred version to 5.0
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/conf/machine/include/x86-base.inc | 2 | ||||
| -rw-r--r-- | meta/conf/machine/qemuarm64.conf | 2 | ||||
| -rw-r--r-- | meta/conf/machine/qemuarmv5.conf | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/meta/conf/machine/include/x86-base.inc b/meta/conf/machine/include/x86-base.inc index c29279209b..686f938233 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.18%" +PREFERRED_VERSION_linux-yocto ??= "5.0%" # # XSERVER subcomponents, used to build the XSERVER variable diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf index 6919e555a8..22f6cb742b 100644 --- a/meta/conf/machine/qemuarm64.conf +++ b/meta/conf/machine/qemuarm64.conf @@ -29,5 +29,3 @@ QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio # Virtio serial console QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon" QB_TCPSERIAL_OPT = "-device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon" - -PREFERRED_VERSION_linux-yocto ?= "4.19%" diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf index 5f90accc24..e3948a25da 100644 --- a/meta/conf/machine/qemuarmv5.conf +++ b/meta/conf/machine/qemuarmv5.conf @@ -17,7 +17,7 @@ QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" -PREFERRED_VERSION_linux-yocto ??= "4.18%" +PREFERRED_VERSION_linux-yocto ??= "5.0%" QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" KMACHINE_qemuarmv5 = "qemuarm"
\ No newline at end of file |