diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-08-30 12:06:32 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-01 22:33:07 +0100 |
| commit | 456a92116a4367c8189e36148282bb8ad992efd0 (patch) | |
| tree | 0d084d76fa857e60f8ffd36192e96c61be58fc49 /meta | |
| parent | 636188943de3355e6e975be8cd8c0b368ce2c5ec (diff) | |
| download | poky-456a92116a4367c8189e36148282bb8ad992efd0.tar.gz | |
qemu: bump linux-yocto preferred version to 5.2
(From OE-Core rev: 0504760978b65627bb265503896bc2dfb0709475)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/conf/machine/include/x86-base.inc | 2 | ||||
| -rw-r--r-- | meta/conf/machine/qemuarmv5.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 686f938233..0227f3c289 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" | |||
| 18 | # kernel-related variables | 18 | # kernel-related variables |
| 19 | # | 19 | # |
| 20 | PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" | 20 | PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" |
| 21 | PREFERRED_VERSION_linux-yocto ??= "5.0%" | 21 | PREFERRED_VERSION_linux-yocto ??= "5.2%" |
| 22 | 22 | ||
| 23 | # | 23 | # |
| 24 | # XSERVER subcomponents, used to build the XSERVER variable | 24 | # XSERVER subcomponents, used to build the XSERVER variable |
diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf index 1c21d3342d..fb4789fdac 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" | |||
| 17 | QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" | 17 | QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" |
| 18 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 18 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
| 19 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" | 19 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" |
| 20 | PREFERRED_VERSION_linux-yocto ??= "5.0%" | 20 | PREFERRED_VERSION_linux-yocto ??= "5.2%" |
| 21 | QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" | 21 | QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" |
| 22 | 22 | ||
| 23 | KMACHINE_qemuarmv5 = "qemuarm" | 23 | KMACHINE_qemuarmv5 = "qemuarm" |