diff options
author | Kalle Viironen <kalle.viironen@digia.com> | 2014-05-26 13:54:08 +0300 |
---|---|---|
committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-05-26 13:54:14 +0300 |
commit | 24cb0946765e299d4553ab5fa2a37afcac1ea242 (patch) | |
tree | 059b678bd52fb3c49841f585054517673ce4e288 /recipes/packagegroup | |
parent | bfb97bc3cc517c42647f5f8b1308bb7b1f4c76f1 (diff) | |
parent | 2ab3d7fc456ece32ab23e1909ea0d865955f29d9 (diff) | |
download | meta-boot2qt-QtEE_v3.0.0.tar.gz |
Merge branch 'stable' into releaseQtEE_v3.0.0
* stable: (25 commits)
blacklist evbug kernel module
ca-certificates: enable c_rehash in update-ca-certificates
openssl: make sure c_rehash is included in the image
emulator: include mesa back to the image
mesa: include gles development files in sdk
sabre: updated kernel arguments
imx6: kernel update for nitrogen6x
mesa: remove from emulator image
Include support for Freescale SABRE SD (iMX6Q)
sabresd: add function fs support to sabresd kernel
gstreamer: include icydemuxer needed for internet radios
libsdl: disable dependency to libglu
linux-yocto: upstream version has changed
wpa-supplicant: upstream version has changed
gpu-viv-bin-mx6q: upstream version has changed
busybox: upstream version has changed
nitrogen6x: use preferred version for kernel
libgles: inhibit QA error for files already being stripped
Update used branch to daisy
Move to version 1.6
...
Change-Id: Ie81ed17be1096dbb37b1e5f023aa4eba846ca0fe
Diffstat (limited to 'recipes/packagegroup')
3 files changed, 7 insertions, 0 deletions
diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb index 9c92438..281204c 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb | |||
@@ -30,6 +30,10 @@ require recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb | |||
30 | RDEPENDS_${PN} = "\ | 30 | RDEPENDS_${PN} = "\ |
31 | python-nativesdk \ | 31 | python-nativesdk \ |
32 | python-subprocess-nativesdk \ | 32 | python-subprocess-nativesdk \ |
33 | python-compiler-nativesdk \ | ||
34 | python-multiprocessing-nativesdk \ | ||
35 | python-shell-nativesdk \ | ||
36 | python-threading-nativesdk \ | ||
33 | " | 37 | " |
34 | 38 | ||
35 | 39 | ||
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb index 0942a7e..bcc7868 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb | |||
@@ -32,6 +32,7 @@ RDEPENDS_${PN} = "\ | |||
32 | psplash \ | 32 | psplash \ |
33 | openssh-sftp-server \ | 33 | openssh-sftp-server \ |
34 | openssl \ | 34 | openssl \ |
35 | openssl-misc \ | ||
35 | libpng \ | 36 | libpng \ |
36 | jpeg \ | 37 | jpeg \ |
37 | tiff \ | 38 | tiff \ |
@@ -45,5 +46,6 @@ RDEPENDS_${PN} = "\ | |||
45 | alsa-utils-amixer \ | 46 | alsa-utils-amixer \ |
46 | hunspell \ | 47 | hunspell \ |
47 | ca-certificates \ | 48 | ca-certificates \ |
49 | linux-firmware \ | ||
48 | ${MACHINE_EXTRA_INSTALL} \ | 50 | ${MACHINE_EXTRA_INSTALL} \ |
49 | " | 51 | " |
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb index f6a8a54..5a076c1 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb | |||
@@ -35,6 +35,7 @@ RDEPENDS_${PN} = "\ | |||
35 | gst-plugins-good-id3demux \ | 35 | gst-plugins-good-id3demux \ |
36 | gst-plugins-good-auparse \ | 36 | gst-plugins-good-auparse \ |
37 | gst-plugins-good-isomp4 \ | 37 | gst-plugins-good-isomp4 \ |
38 | gst-plugins-good-icydemux \ | ||
38 | gst-plugins-ugly-rmdemux \ | 39 | gst-plugins-ugly-rmdemux \ |
39 | gst-plugins-ugly-asf \ | 40 | gst-plugins-ugly-asf \ |
40 | gst-plugins-ugly-a52dec \ | 41 | gst-plugins-ugly-a52dec \ |