diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2014-11-24 15:04:53 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2014-11-24 15:04:53 +0200 |
| commit | 69ecb0fe763a1757630732a965c65a9b7371f3b3 (patch) | |
| tree | 588ecdbac4626565d9a65f6a7e91cb2bf35aefc9 /meta-toradex-extras | |
| parent | 4120fbde76371e0445956c0b5b79a15cc20cd986 (diff) | |
| parent | 30b37c39b18ab15f521395dc2012e948475d2741 (diff) | |
| download | meta-boot2qt-69ecb0fe763a1757630732a965c65a9b7371f3b3.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
* origin/stable:
toolchain: include base-files
Update meta-fsl-arm-extra to fix u-boot-boundary fetch failure
Install fonts with help of Yocto recipes
bbb: remove preferred version for SGX
Update Qt logo
Remove u-boot-fw-utils
Change copyright notice
Conflicts:
b2qt-init-build-env
conf/distro/include/beaglebone.conf
recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb
Change-Id: I5b22412d0530e70057f705da34247803498ddde3
Diffstat (limited to 'meta-toradex-extras')
4 files changed, 4 insertions, 4 deletions
diff --git a/meta-toradex-extras/conf/layer.conf b/meta-toradex-extras/conf/layer.conf index aba9374..1d0c27f 100644 --- a/meta-toradex-extras/conf/layer.conf +++ b/meta-toradex-extras/conf/layer.conf | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | ## agreement. | 13 | ## agreement. |
| 14 | ## | 14 | ## |
| 15 | ## For further information use the contact form at | 15 | ## For further information use the contact form at |
| 16 | ## http://qt.digia.com/contact-us. | 16 | ## http://www.qt.io/contact-us. |
| 17 | ## | 17 | ## |
| 18 | ## | 18 | ## |
| 19 | ## $QT_END_LICENSE$ | 19 | ## $QT_END_LICENSE$ |
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend index 0bcbad7..f054071 100644 --- a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend +++ b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | ## agreement. | 13 | ## agreement. |
| 14 | ## | 14 | ## |
| 15 | ## For further information use the contact form at | 15 | ## For further information use the contact form at |
| 16 | ## http://qt.digia.com/contact-us. | 16 | ## http://www.qt.io/contact-us. |
| 17 | ## | 17 | ## |
| 18 | ## | 18 | ## |
| 19 | ## $QT_END_LICENSE$ | 19 | ## $QT_END_LICENSE$ |
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb index 4254062..b83e6a0 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | ## agreement. | 13 | ## agreement. |
| 14 | ## | 14 | ## |
| 15 | ## For further information use the contact form at | 15 | ## For further information use the contact form at |
| 16 | ## http://qt.digia.com/contact-us. | 16 | ## http://www.qt.io/contact-us. |
| 17 | ## | 17 | ## |
| 18 | ## | 18 | ## |
| 19 | ## $QT_END_LICENSE$ | 19 | ## $QT_END_LICENSE$ |
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend index 3d32eb9..08f1b1a 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend +++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | ## agreement. | 13 | ## agreement. |
| 14 | ## | 14 | ## |
| 15 | ## For further information use the contact form at | 15 | ## For further information use the contact form at |
| 16 | ## http://qt.digia.com/contact-us. | 16 | ## http://www.qt.io/contact-us. |
| 17 | ## | 17 | ## |
| 18 | ## | 18 | ## |
| 19 | ## $QT_END_LICENSE$ | 19 | ## $QT_END_LICENSE$ |