From f5badb8b9ecea65c342368da4371879500185e50 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Tue, 3 Dec 2013 17:38:42 +0100 Subject: [PATCH] linux-sysmocom: workaround for edison, which derives git${SRCPV} from local bb_persist_data --- conf/machine/include/sysmobts.inc | 2 +- recipes-bsp/linux/linux-sysmocom_3.2.bb | 2 ++ recipes-bsp/linux/linux-sysmocom_git.bb | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/conf/machine/include/sysmobts.inc b/conf/machine/include/sysmobts.inc index e3240b8..73cb0ad 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.7+gitAUTOINC+a1a9f198c2'), ('1.1.2','3.2.48+git2+bcc4fa827be7f59486ff305d664b42a142025f9b')])[d.getVar('DISTRO_VERSION', True)]}" +PREFERRED_VERSION_linux-sysmocom = "${@ dict([('1.5','3.10.7+gitAUTOINC+a1a9f198c2'), ('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/recipes-bsp/linux/linux-sysmocom_3.2.bb b/recipes-bsp/linux/linux-sysmocom_3.2.bb index 51441b4..bc73a7f 100644 --- a/recipes-bsp/linux/linux-sysmocom_3.2.bb +++ b/recipes-bsp/linux/linux-sysmocom_3.2.bb @@ -54,3 +54,5 @@ RDEPENDS_kernel-module-dspdl-dm644x += "sysmobts-firmware" RDEPENDS_kernel-module-fpgadl-par += "sysmobts-firmware" RDEPENDS_kernel-module-msgqueue += "sysmobts-firmware" RDEPENDS_kernel-module-rtfifo += "sysmobts-firmware" + +DEFAULT_PREFERENCE = "20" diff --git a/recipes-bsp/linux/linux-sysmocom_git.bb b/recipes-bsp/linux/linux-sysmocom_git.bb index 7ef8427..38de13b 100644 --- a/recipes-bsp/linux/linux-sysmocom_git.bb +++ b/recipes-bsp/linux/linux-sysmocom_git.bb @@ -58,3 +58,5 @@ RDEPENDS_kernel-module-dspdl-dm644x += "sysmobts-firmware" RDEPENDS_kernel-module-fpgadl-par += "sysmobts-firmware" RDEPENDS_kernel-module-msgqueue += "sysmobts-firmware" RDEPENDS_kernel-module-rtfifo += "sysmobts-firmware" + +DEFAULT_PREFERENCE = "-1"