From 5010fb6570846eecb8976810f67b1f5e3d0ba5e3 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 15 Mar 2016 12:18:13 +0200 Subject: Disable ethernet over usb on SMARC-sAMX6i Otherwise the device isn't auto detected by adb on windows. Task-number: QTBUG-51877 Change-Id: Ia52d4dd8e6cc10aec82b0ea6d50f3b00f412d7d5 Reviewed-by: David Schulz --- meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend | 4 ++++ 1 file changed, 4 insertions(+) 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 -- cgit v1.2.3-54-g00ecf From 5d3414342d9b5af1f531702aa25180407837c21f Mon Sep 17 00:00:00 2001 From: Louai Al-Khanji Date: Thu, 10 Mar 2016 23:25:37 -0800 Subject: Specify source revision separately By doing so we ensure bitbake can mirror the source locally. Handy on airplanes. Change-Id: Iaaf96617a4cc0c445444dbdb8d3e562cc9cd1741 Reviewed-by: Samuli Piippo --- recipes/libgsystem/libgsystem.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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" -- cgit v1.2.3-54-g00ecf From ef1c1f258ab449230d644442df667f89023f38d4 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 15 Mar 2016 17:08:06 +0200 Subject: colibri-imx6: don't pull in old gstreamer gst-fsl-plugin pulls in gstremer 0.10, even when 1.0 was selected. Change-Id: I60f8e6bef8fd1abe1913f4019b847757718fbded Reviewed-by: Teemu Holappa --- conf/distro/include/colibri-imx6.conf | 1 - 1 file changed, 1 deletion(-) 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)} \ " -- cgit v1.2.3-54-g00ecf From bea48bd0716cc8c60d4e3b3ddb497555f1905b33 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 10 Mar 2016 13:05:33 +0200 Subject: qt5: remove duplicate --sysroot from sdk mkspec No need to add --sysroot to QMAKE flags in qdevice.pri, since qconfig.pri does it already. Change-Id: I8a90249e466f8385fb121d69721e118a32b80999 Reviewed-by: David Schulz --- classes/populate_b2qt_qt5_sdk.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 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 -- cgit v1.2.3-54-g00ecf