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

diff --cc conf/machine/include/imx-base.inc
Simple merge

diff --cc recipes-graphics/mesa/mesa_%.bbappend
index ff2a9815299d0ce7e379edcd457cb4977cf9ab3d,863131d1d54f0429cf6c3f8893443b3c4e49fbef..01ac7c6563bb306d3402b1263650830a4665e4a7
--- 1/recipes-graphics/mesa/mesa_%.bbappend
--- 2/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.* \