summaryrefslogtreecommitdiffstats
path: root/meta-ti-extras/recipes
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2014-11-24 15:04:53 +0200
committerSamuli Piippo <samuli.piippo@theqtcompany.com>2014-11-24 15:04:53 +0200
commit69ecb0fe763a1757630732a965c65a9b7371f3b3 (patch)
tree588ecdbac4626565d9a65f6a7e91cb2bf35aefc9 /meta-ti-extras/recipes
parent4120fbde76371e0445956c0b5b79a15cc20cd986 (diff)
parent30b37c39b18ab15f521395dc2012e948475d2741 (diff)
downloadmeta-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-ti-extras/recipes')
-rw-r--r--meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend2
-rw-r--r--meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend2
-rw-r--r--meta-ti-extras/recipes/linux/linux-am335x-psp_3.2.bbappend2
-rw-r--r--meta-ti-extras/recipes/linux/linux-mainline_3.2.bbappend2
-rw-r--r--meta-ti-extras/recipes/linux/linux-ti-staging_3.12.bbappend2
-rw-r--r--meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend2
-rw-r--r--meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend2
7 files changed, 7 insertions, 7 deletions
diff --git a/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend b/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
index 0646e73..3cad977 100644
--- a/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
+++ b/meta-ti-extras/recipes/libgles/libgles-omap3_4.09.00.01.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-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend b/meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend
index 9a90577..9917d00 100644
--- a/meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.bbappend
+++ b/meta-ti-extras/recipes/libgles/libgles-omap3_5.01.01.01.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-ti-extras/recipes/linux/linux-am335x-psp_3.2.bbappend b/meta-ti-extras/recipes/linux/linux-am335x-psp_3.2.bbappend
index fd7dd31..0b4beff 100644
--- a/meta-ti-extras/recipes/linux/linux-am335x-psp_3.2.bbappend
+++ b/meta-ti-extras/recipes/linux/linux-am335x-psp_3.2.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-ti-extras/recipes/linux/linux-mainline_3.2.bbappend b/meta-ti-extras/recipes/linux/linux-mainline_3.2.bbappend
index 9e195dc..502edf1 100644
--- a/meta-ti-extras/recipes/linux/linux-mainline_3.2.bbappend
+++ b/meta-ti-extras/recipes/linux/linux-mainline_3.2.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-ti-extras/recipes/linux/linux-ti-staging_3.12.bbappend b/meta-ti-extras/recipes/linux/linux-ti-staging_3.12.bbappend
index b2d6104..b6f70cd 100644
--- a/meta-ti-extras/recipes/linux/linux-ti-staging_3.12.bbappend
+++ b/meta-ti-extras/recipes/linux/linux-ti-staging_3.12.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-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend b/meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend
index 2b1c656..4ea1893 100644
--- a/meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend
+++ b/meta-ti-extras/recipes/u-boot/u-boot-am33x_2013.01.01.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-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend b/meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend
index bad928b..4c8818a 100644
--- a/meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend
+++ b/meta-ti-extras/recipes/u-boot/u-boot-ti-staging_2013.10.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$
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-13 11:00:36 +0000