From a425d28ed74d973753731cab4e44283e47a63dc2 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 31 Jul 2014 15:48:09 +0200 Subject: [PATCH] misc: Simplify selection based on targeted distro I wish I could have made it more simple but at least only compare the 1.X of the poky version as minor versions generally do not upgrade the core components --- conf/layer.conf | 2 +- conf/machine/sysmocom-bsc.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index 4ac4a1b..ebc850d 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,7 +9,7 @@ BBFILES += "${LAYERDIR}/yocto-shared/*.bbappend" BBFILES += "${BBFILES_SYSMOCOM_BSP}" # selects specific distro or master when DISTRO_VERSION contains SNAPSHOT -BBFILES_SYSMOCOM_BSP = "${LAYERDIR}/yocto-${@ [dict([('1.5','dora'), ('1.5.1', 'dora'), ('1.5.2', 'dora'), ('1.5.3', 'dora'), ('1.1.2','edison')])[d.getVar('DISTRO_VERSION', True)], 'master']['SNAPSHOT' in d.getVar('DISTRO_VERSION', True)]}/*.bbappend" +BBFILES_SYSMOCOM_BSP = "${LAYERDIR}/yocto-${@ [dict([('1.5', 'dora'), ('1.1','edison')])[d.getVar('DISTRO_VERSION', True)[0:3]], 'master']['SNAPSHOT' in d.getVar('DISTRO_VERSION', True)]}/*.bbappend" BBFILE_COLLECTIONS += "sysmocom-bsp" BBFILE_PATTERN_sysmocom-bsp := "^${LAYERDIR}/" diff --git a/conf/machine/sysmocom-bsc.conf b/conf/machine/sysmocom-bsc.conf index de586f1..93b46ea 100644 --- a/conf/machine/sysmocom-bsc.conf +++ b/conf/machine/sysmocom-bsc.conf @@ -8,7 +8,7 @@ PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" -PREFERRED_PROVIDER_virtual/kernel = "${@ dict([('1.5','linux-sysmocom'), ('1.5.1', 'linux-sysmocom'), ('1.5.1', 'linux-sysmocom'), ('1.1.2','linux')])[d.getVar('DISTRO_VERSION', True)]}" +PREFERRED_PROVIDER_virtual/kernel = "${@ dict([('1.5','linux-sysmocom'), ('1.1','linux')])[d.getVar('DISTRO_VERSION', True)[0:3]]}" require conf/machine/include/tune-geode.inc