From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 23 May 2017 01:28:57 +0000 (-0300)
Subject: Merge remote-tracking branch 'yocto/morty' into morty+ossystems
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=3919a2762c70ff721353c515804e596019cb56f2;p=meta-freescale.git

Merge remote-tracking branch 'yocto/morty' into morty+ossystems

* yocto/morty:
  imx-kobs: Fix a typo
  mesa: fix configuration rewrite
  imx-kobs: Fix build with musl
  imx-kobs: Pick up new commit as fix-compile patch is merged
  classes/image_types_fsl: Fix mxsboot image generation
  imx-base: Fix uboot.mxsboot-sdcard IMAGE_FSTYPES name
  fsl-kernel-localversion: Add preconfigure dependency on do_unpack
---

3919a2762c70ff721353c515804e596019cb56f2
diff --cc recipes-graphics/mesa/mesa_%.bbappend
index ff2a9815,863131d1..01ac7c65
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@@ -34,15 -9,10 +34,14 @@@ python () 
      if "imxgpu2d" not in overrides:
          return
  
-     extra_oeconf = d.getVar("EXTRA_OECONF", True)
-     extra_oeconf = extra_oeconf.replace("--enable-glx-tls", "--enable-glx")
-     d.setVar("EXTRA_OECONF", extra_oeconf)
+     x11flag = d.getVarFlag("PACKAGECONFIG", "x11", False)
+     d.setVarFlag("PACKAGECONFIG", "x11", x11flag.replace("--enable-glx-tls", "--enable-glx"))
  }
  
 +# Enable Etnaviv support
 +PACKAGECONFIG_append_use-mainline-bsp = " gallium"
 +GALLIUMDRIVERS_append_use-mainline-bsp = ",etnaviv,imx"
 +
  # FIXME: Dirty hack to allow use of Vivante GPU libGL binary
  do_install_append_imxgpu3d () {
      rm -f ${D}${libdir}/libGL.* \