diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-03-15 08:43:38 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-03-15 08:44:19 +0200 |
commit | 9eb4a4ca74de48387a794336df7bfd3076919ed8 (patch) | |
tree | df047176185ff6e9428363d12cd160fe258319a6 /b2qt-init-build-env | |
parent | 0a1b5fdeb2d91e28c8281f30b6e4957203a82994 (diff) | |
parent | ce704ae0105f6d17b4628d1e67bfb25a78289147 (diff) | |
download | meta-boot2qt-9eb4a4ca74de48387a794336df7bfd3076919ed8.tar.gz |
Merge remote-tracking branch 'origin/fido' into dev
* origin/fido: (36 commits)
qt5: update submodules
b2qt-demos: update revision
b2qt-appcontroller: update revision
qt5: move mingw32 specific parts from meta-qt5
qt5: Use latest version of meta-qt5
b2qt-demos: update to new revision
ostree: Mount boot partition from user space
ostree: Do not use grub2-mkconfig.
RPi2: add support for touch display
Disable ethernet over usb on beaglebone.
qtwayland: update SRCREV
Move default sstate-cache dir from build dir
Use distro specific sstate cache
qtquickcompiler: add support for BYOS builds
qtcharts: update revision
qt5: update submodules
democompositor: use correct path the SDK sources
b2qt-demos: update SRCREV
Add git SHA1 to b2qt addon package versions
b2qt-utils: update SRCREV
...
Conflicts:
recipes-qt/qt5/qtconnectivity_git.bbappend
Change-Id: I1c090c8f87e43664971e0381b93ccad5e4e48175
Diffstat (limited to 'b2qt-init-build-env')
-rwxr-xr-x | b2qt-init-build-env | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env index 0ae2503..ef2e024 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env | |||
@@ -95,9 +95,12 @@ get_groups() { | |||
95 | apalis-imx6|colibri-imx6|colibri-vf) | 95 | apalis-imx6|colibri-imx6|colibri-vf) |
96 | PROJECT_GROUPS="toradex" | 96 | PROJECT_GROUPS="toradex" |
97 | ;; | 97 | ;; |
98 | imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x|smarc-samx6i) | 98 | imx53qsb|imx6qsabresd|imx6dlsabresd|nitrogen6x) |
99 | PROJECT_GROUPS="fsl" | 99 | PROJECT_GROUPS="fsl" |
100 | ;; | 100 | ;; |
101 | smarc-samx6i) | ||
102 | PROJECT_GROUPS="smx6" | ||
103 | ;; | ||
101 | tibidabo) | 104 | tibidabo) |
102 | PROJECT_GROUPS="architech" | 105 | PROJECT_GROUPS="architech" |
103 | ;; | 106 | ;; |