Merge remote-tracking branch 'origin/fido' into dev

* origin/fido:
  qt5: remove duplicate --sysroot from sdk mkspec
  colibri-imx6: don't pull in old gstreamer
  Specify source revision separately
  Disable ethernet over usb on SMARC-sAMX6i

Change-Id: Ic14fccc65d7d30c8400f8fc09bf127fef187bc86

4 files changed, 10 insertions, 5 deletions

diff --git a/classes/populate_b2qt_qt5_sdk.bbclass b/classes/populate_b2qt_qt5_sdk.bbclass
index 5f45b05..d6b2b10 100644
--- a/classes/populate_b2qt_qt5_sdk.bbclass
+++ b/classes/populate_b2qt_qt5_sdk.bbclass
@@ -49,9 +49,9 @@ EOF
     done
     echo "MACHINE = ${MACHINE}" > ${SDK_DEVICE_PRI}
     echo "CROSS_COMPILE = \$\$[QT_HOST_PREFIX]${bindir_nativesdk}/${TARGET_SYS}/${TARGET_PREFIX}" >> ${SDK_DEVICE_PRI}
-    echo "QMAKE_CFLAGS *= ${TARGET_CC_ARCH} --sysroot=\$\$[QT_SYSROOT] ${static_cflags}" >> ${SDK_DEVICE_PRI}
-    echo "QMAKE_CXXFLAGS *= ${TARGET_CC_ARCH} --sysroot=\$\$[QT_SYSROOT] ${static_cxxflags}" >> ${SDK_DEVICE_PRI}
-    echo "QMAKE_LFLAGS *= ${TARGET_CC_ARCH} --sysroot=\$\$[QT_SYSROOT] ${TARGET_LDFLAGS}" >> ${SDK_DEVICE_PRI}
+    echo "QMAKE_CFLAGS *= ${TARGET_CC_ARCH} ${static_cflags}" >> ${SDK_DEVICE_PRI}
+    echo "QMAKE_CXXFLAGS *= ${TARGET_CC_ARCH} ${static_cxxflags}" >> ${SDK_DEVICE_PRI}
+    echo "QMAKE_LFLAGS *= ${TARGET_CC_ARCH} ${TARGET_LDFLAGS}" >> ${SDK_DEVICE_PRI}
 
     # Setup qt.conf to point at the device mkspec by default
     qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf
index 4c9a923..4cde248 100644
--- a/conf/distro/include/colibri-imx6.conf
+++ b/conf/distro/include/colibri-imx6.conf
@@ -43,7 +43,6 @@ MACHINE_EXTRA_INSTALL = "\
         libgal-mx6 \
         libegl-mx6 \
         libgles2-mx6 \
-        gst-fsl-plugin \
         ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
         ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
         "
diff --git a/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend b/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend
index 00f3c11..330a4f1 100644
--- a/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend
+++ b/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend
@@ -20,6 +20,10 @@
 ##############################################################################
 
 do_configure_prepend() {
+    sed -e '/CONFIG_USB_FUNCTIONFS_ETH=/d' \
+        -e '/CONFIG_USB_FUNCTIONFS_RNDIS=/d' \
+        -i ${WORKDIR}/defconfig
+
     echo "CONFIG_NAMESPACES=y"              >> ${WORKDIR}/defconfig
     echo "CONFIG_FHANDLE=y"                 >> ${WORKDIR}/defconfig
     echo "CONFIG_CGROUPS=y"                 >> ${WORKDIR}/defconfig
diff --git a/recipes/libgsystem/libgsystem.bb b/recipes/libgsystem/libgsystem.bb
index fde40d8..53d8215 100644
--- a/recipes/libgsystem/libgsystem.bb
+++ b/recipes/libgsystem/libgsystem.bb
@@ -26,7 +26,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
 
 inherit autotools pkgconfig
 
-SRC_URI = "gitsm://github.com/GNOME/libgsystem.git;tag=v2015.2;protocol=git"
+SRC_URI = "gitsm://github.com/GNOME/libgsystem.git;protocol=git"
+SRCREV = "86c24c181ec6c3ec334a39145efc022c3e744929"
+
 S = "${WORKDIR}/git"
 
 DEPENDS = "glib-2.0 attr libcap"