diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2017-04-04 10:02:02 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-05 23:22:12 +0100 |
| commit | 37cfcd2ccac48be9e15ac5074f437421b31cab5f (patch) | |
| tree | 797ea381cfce648013342c8e2095404c8bdd21d7 /meta | |
| parent | 5e3a636b20f3bdb62d78a2ec6978b4ae0eb8b51b (diff) | |
| download | poky-37cfcd2ccac48be9e15ac5074f437421b31cab5f.tar.gz | |
x86-base.inc, qemuarm.conf: prefer 4.10 version of linux-yocto
* 4.8 version was removed in:
commit 466e6e45ca04a07ebe1b1f52de747f077b362d54
Author: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Tue Mar 28 08:58:07 2017 -0400
linux-yocto: drop 4.8 recipes
We have 4.1 (LTSI), 4.4 (LTS), 4.9 (LTS/LTSI) and 4.10 available in
master. 4.8 is no longer required, so we drop the recipe to keep
the version selection under control.
* causing each build to start with 188 lines of this stuff:
NOTE: preferred version 4.8% of linux-yocto not available (for item virtual/kernel)
NOTE: versions of linux-yocto available: 4.1.38+gitAUTOINC+7140ddb86e_4d2c95e78c 4.10.5+gitAUTOINC+01f18cba44_b97dcd4f06 4.4.56+gitAUTOINC+271b0c8d51_01aaede0a2 4.9.17+gitAUTOINC+8b97a445fa_3ff3760c2a
NOTE: preferred version 4.8% of linux-yocto not available (for item kernel-module-raid456)
NOTE: versions of linux-yocto available: 4.1.38+gitAUTOINC+7140ddb86e_4d2c95e78c 4.10.5+gitAUTOINC+01f18cba44_b97dcd4f06 4.4.56+gitAUTOINC+271b0c8d51_01aaede0a2 4.9.17+gitAUTOINC+8b97a445fa_3ff3760c2a
(From OE-Core rev: 57357d4e7f5d256a5cc657798f955f1ac8416665)
Signed-off-by: Martin Jansa <Martin.Jansa@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/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 40d59577fd..7365953ca8 100644 --- a/meta/conf/machine/include/x86-base.inc +++ b/meta/conf/machine/include/x86-base.inc | |||
| @@ -20,7 +20,7 @@ SERIAL_CONSOLE ?= "115200 ttyS0" | |||
| 20 | # kernel-related variables | 20 | # kernel-related variables |
| 21 | # | 21 | # |
| 22 | PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" | 22 | PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" |
| 23 | PREFERRED_VERSION_linux-yocto ??= "4.8%" | 23 | PREFERRED_VERSION_linux-yocto ??= "4.10%" |
| 24 | 24 | ||
| 25 | # | 25 | # |
| 26 | # XSERVER subcomponents, used to build the XSERVER variable | 26 | # XSERVER subcomponents, used to build the XSERVER variable |
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index f9d6dd7e36..6b875e415c 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf | |||
| @@ -16,5 +16,5 @@ QB_MACHINE = "-machine versatilepb" | |||
| 16 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" | 16 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" |
| 17 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 17 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
| 18 | QB_OPT_APPEND = "-show-cursor -usb -usbdevice tablet -device virtio-rng-pci" | 18 | QB_OPT_APPEND = "-show-cursor -usb -usbdevice tablet -device virtio-rng-pci" |
| 19 | PREFERRED_VERSION_linux-yocto ??= "4.8%" | 19 | PREFERRED_VERSION_linux-yocto ??= "4.10%" |
| 20 | QB_DTB = "${@base_version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" | 20 | QB_DTB = "${@base_version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" |