diff --git a/conf/layer.conf b/conf/layer.conf index dae822c..ad969b0 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.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.5.1', 'dora'), ('1.5.2', 'dora'), ('1.1.2','edison')])[d.getVar('DISTRO_VERSION', True)], 'master']['SNAPSHOT' in d.getVar('DISTRO_VERSION', True)]}/*.bbappend" BBFILE_COLLECTIONS += "sysmocom-bsp" BBFILE_PATTERN_sysmocom-bsp := "^${LAYERDIR}/" diff --git a/conf/machine/include/sysmobts.inc b/conf/machine/include/sysmobts.inc index bdaa032..43f603a 100644 --- a/conf/machine/include/sysmobts.inc +++ b/conf/machine/include/sysmobts.inc @@ -1,7 +1,7 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_virtual/kernel = "linux-sysmocom" -PREFERRED_VERSION_linux-sysmocom = "${@ dict([('1.5','3.10.40+git%'), ('1.5.1','3.10.40+git%'), ('1.1.2','')])[d.getVar('DISTRO_VERSION', True)]}" +PREFERRED_VERSION_linux-sysmocom = "${@ dict([('1.5','3.10.40+git%'), ('1.5.1','3.10.40+git%'), ('1.5.2','3.10.40+git%'), ('1.1.2','')])[d.getVar('DISTRO_VERSION', True)]}" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" PREFERRED_VERSION_u-boot = "git" diff --git a/conf/machine/sysmocom-bsc.conf b/conf/machine/sysmocom-bsc.conf index 14059e5..de586f1 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.1.2','linux')])[d.getVar('DISTRO_VERSION', True)]}" +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)]}" require conf/machine/include/tune-geode.inc