From 60aceccd0d8d8ec8c615123e0343b3937d34d212 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Tue, 25 Apr 2017 18:01:53 +0200 Subject: [PATCH] bsc/idu: Drop edison (1.1) support and stick to 3.10er kernel This is fixing the QA issue on newer perf for x86 on Dora as seen by the CI system. Drop support for ancient unsupported OE version and force 3.10/4.9 depending on where we are. --- conf/machine/sysmocom-bsc.conf | 3 ++- conf/machine/sysmocom-idu.conf | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/conf/machine/sysmocom-bsc.conf b/conf/machine/sysmocom-bsc.conf index 7d5601a..8476894 100644 --- a/conf/machine/sysmocom-bsc.conf +++ b/conf/machine/sysmocom-bsc.conf @@ -8,7 +8,8 @@ PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" -PREFERRED_PROVIDER_virtual/kernel = "${@['linux-sysmocom', 'linux']['1.1' in d.getVar('DISTRO_VERSION', True)]}" +PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom" +PREFERRED_VERSION_linux-sysmocom = "${@dict([('1.5', '3.10.84+git%')]).get(d.getVar('DISTRO_VERSION', True)[0:3],'4.9.14+git%')}" require conf/machine/include/tune-geode.inc diff --git a/conf/machine/sysmocom-idu.conf b/conf/machine/sysmocom-idu.conf index 5827bc7..c1a8891 100644 --- a/conf/machine/sysmocom-idu.conf +++ b/conf/machine/sysmocom-idu.conf @@ -10,7 +10,8 @@ PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-diet" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" -PREFERRED_PROVIDER_virtual/kernel = "${@['linux-sysmocom', 'linux']['1.1' in d.getVar('DISTRO_VERSION', True)]}" +PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom" +PREFERRED_VERSION_linux-sysmocom = "${@dict([('1.5', '3.10.84+git%')]).get(d.getVar('DISTRO_VERSION', True)[0:3],'4.9.14+git%')}" MACHINE_FEATURES += "kernel26 x86 usbhost pci acpi"