diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-10-31 09:12:03 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-10-31 09:12:03 +0200 |
| commit | ff5338d5189d60fe91d842fe1be26bd69a042f96 (patch) | |
| tree | fcdad806b1aab2dc83982779e5fa774cc59d5108 /meta-fsl-extras | |
| parent | 17bb365744a233dba7483be2c86b34a8c17f125a (diff) | |
| parent | 18c5cb7ecea53c07682ddfeda821e4fd32a14328 (diff) | |
| download | meta-boot2qt-ff5338d5189d60fe91d842fe1be26bd69a042f96.tar.gz | |
Merge remote-tracking branch 'origin/jethro' into dev
* origin/jethro:
VKB: correctly override PACKAGECONFIG
psplash: remove from image
imx6: enable QT_QPA_EGLFS_FORCEVSYNC for all imx6 devices
colibri-vf: use older 4.1 version of kernel to fix color issue
colibri-imx7: add u-boot-nand.imx to image
colibri-vf: add kernel image to rootfs
dbus-session-init: fix broken init script
Improve repo fetching
qt5 recipes cleanup
qt5: update submodules
qt5: remove obsolete file 0001-Allow-a-tools-only-build.patch
Conflicts:
meta-raspberrypi-extras/recipes/bluez5/bluez5_%.bbappend
recipes-qt/qt5/nativesdk-qtbase_git.bbappend
recipes-qt/qt5/qt3d_git.bbappend
recipes-qt/qt5/qtbase-native_git.bbappend
recipes-qt/qt5/qtbase_git.bbappend
recipes-qt/qt5/qtcanvas3d_git.bbappend
recipes-qt/qt5/qtcharts_git.bbappend
recipes-qt/qt5/qtconnectivity_git.bbappend
recipes-qt/qt5/qtdeclarative_git.bbappend
recipes-qt/qt5/qtgraphicaleffects_git.bbappend
recipes-qt/qt5/qtimageformats_git.bbappend
recipes-qt/qt5/qtlocation_git.bbappend
recipes-qt/qt5/qtmultimedia_git.bbappend
recipes-qt/qt5/qtquickcontrols2_git.bbappend
recipes-qt/qt5/qtquickcontrols_git.bbappend
recipes-qt/qt5/qtsensors_git.bbappend
recipes-qt/qt5/qtserialbus_git.bbappend
recipes-qt/qt5/qtserialport_git.bbappend
recipes-qt/qt5/qtsvg_git.bbappend
recipes-qt/qt5/qttools_git.bbappend
recipes-qt/qt5/qttranslations_git.bbappend
recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
recipes-qt/qt5/qtwayland_git.bbappend
recipes-qt/qt5/qtwebchannel_git.bbappend
recipes-qt/qt5/qtwebengine_git.bbappend
recipes-qt/qt5/qtwebsockets_git.bbappend
recipes-qt/qt5/qtxmlpatterns_git.bbappend
scripts/manifest.xml
Change-Id: I089e7d3667ac4ed150cc5c2201c2505103f548ee
Diffstat (limited to 'meta-fsl-extras')
| -rw-r--r-- | meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend index 77ce484..dfc24a1 100644 --- a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend | |||
| @@ -27,6 +27,8 @@ | |||
| 27 | ## | 27 | ## |
| 28 | ############################################################################ | 28 | ############################################################################ |
| 29 | 29 | ||
| 30 | RDEPENDS_kernel-base = "kernel-image kernel-devicetree" | ||
| 31 | |||
| 30 | do_configure_prepend () { | 32 | do_configure_prepend () { |
| 31 | # FunctionFS for adb | 33 | # FunctionFS for adb |
| 32 | echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig | 34 | echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig |