[meta-freescale] [meta-fsl-arm][PATCH] weston: Ensure that GPU_PATCH is included only once.
Carlos Alberto Lopez Perez
clopez at igalia.com
Wed Sep 9 08:03:00 PDT 2015
* This happens for example with the wandboard because for
this board SOC_FAMILY is defined as "mx6:mx6dl:mx6q".
Therefore GPU_PATCH is included twice, causing this:
Patch 0001-MGS-840-Add-i.MX6-support-for-weston.patch is already applied; check your series file
ERROR: Function failed: patch_do_patch
---
recipes-graphics/wayland/weston_%.bbappend | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/recipes-graphics/wayland/weston_%.bbappend b/recipes-graphics/wayland/weston_%.bbappend
index a254f07..93ff013 100644
--- a/recipes-graphics/wayland/weston_%.bbappend
+++ b/recipes-graphics/wayland/weston_%.bbappend
@@ -2,10 +2,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
# only install patch for mx6 with a GPU
GPU_PATCH = "file://0001-MGS-840-Add-i.MX6-support-for-weston.patch"
-SRC_URI_append_mx6q = " ${GPU_PATCH}"
-SRC_URI_append_mx6dl = " ${GPU_PATCH}"
-SRC_URI_append_mx6sx = " ${GPU_PATCH}"
-SRC_URI_append_mx6sl = " ${GPU_PATCH}"
+python __anonymous () {
+ gpu_families = [ 'mx6q', 'mx6dl', 'mx6sx', 'mx6sl' ]
+ cur_families = (d.getVar('SOC_FAMILY', True) or '').split(':')
+ if any(map(lambda x: x in cur_families, gpu_families)):
+ d.appendVar('SRC_URI', ' ' + d.getVar('GPU_PATCH', True))
+}
PACKAGECONFIG_append_mx6q = " cairo-glesv2"
PACKAGECONFIG_append_mx6dl = " cairo-glesv2"
--
2.1.4
More information about the meta-freescale
mailing list