summaryrefslogtreecommitdiffstats
path: root/recipes/packagegroup
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 /recipes/packagegroup
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 'recipes/packagegroup')
-rw-r--r--recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb2
-rw-r--r--recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb3
-rw-r--r--recipes/packagegroup/packagegroup-b2qt-embedded-base.bb6
-rw-r--r--recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb2
-rw-r--r--recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb2
5 files changed, 10 insertions, 5 deletions
diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
index 596fd73..5eeaec1 100644
--- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
+++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.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/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb
index 82bcb60..f4b70bf 100644
--- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb
+++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.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$
@@ -31,6 +31,7 @@ MACHINE_EXTRA_INSTALL_SDK ?= ""
31 31
32RDEPENDS_${PN} += "\ 32RDEPENDS_${PN} += "\
33 packagegroup-core-standalone-sdk-target \ 33 packagegroup-core-standalone-sdk-target \
34 base-files \
34 glib-2.0-dev \ 35 glib-2.0-dev \
35 openssl-dev \ 36 openssl-dev \
36 libpng-dev \ 37 libpng-dev \
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
index bcc7868..dd1ab44 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.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$
@@ -47,5 +47,9 @@ RDEPENDS_${PN} = "\
47 hunspell \ 47 hunspell \
48 ca-certificates \ 48 ca-certificates \
49 linux-firmware \ 49 linux-firmware \
50 ttf-devanagari \
51 ttf-opensans \
52 ttf-dejavu-common \
53 ttf-dejavu-sans \
50 ${MACHINE_EXTRA_INSTALL} \ 54 ${MACHINE_EXTRA_INSTALL} \
51 " 55 "
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb
index fdfca05..dd8b176 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.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/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
index 7b528f0..bce34ab 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.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$