diff options
author | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-21 12:08:34 +0200 |
---|---|---|
committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-21 12:08:39 +0200 |
commit | a68e1ea9b2904f7c69330e534da877cf19376219 (patch) | |
tree | b3b6b17eea9ae44206226cc7d47f42841883020f /recipes/images/b2qt-embedded-image.bb | |
parent | 48f7d2b6ef3939417a1bf291a82fa36660b213e6 (diff) | |
parent | ee2541cf756ddada9bd008b148267e2836d42450 (diff) | |
download | meta-boot2qt-a68e1ea9b2904f7c69330e534da877cf19376219.tar.gz |
Merge branch 'stable' into releaseQtEE_v2.0.0
* stable: (34 commits)
udev: disable udev-cache also for beagleboard
busybox: use ifplugd to enable hotplug networking
Move libgl workaround to libsdl
imx53: change to correct GPU driver package
emulator: don't build mesa with llvm anymore
Fix emulator hdd image building
emulator: alsa config to allow multiple source to play audio
hunspell: use multple checksums for hunspell srcs
Changes to init script
Add script to initialize yocto build env
Add missing copyright headers
Update copyright year to 2014
adb: use modprobe to load dependency modules
udev: disable udev-cache on beaglebone
Add support for BeagleBone Black
Recipe for hunspell
upgrade emulator components
gpu-viv-bin-mx6q: remove dependency to mesa
rpi: disable bbappend from meta-raspberrypi
Install all kernel modules
...
Change-Id: I7adca9894ee35092d546babb1926edbf06300feb
Diffstat (limited to 'recipes/images/b2qt-embedded-image.bb')
-rw-r--r-- | recipes/images/b2qt-embedded-image.bb | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb index 6dc4f1f..a9ec3bf 100644 --- a/recipes/images/b2qt-embedded-image.bb +++ b/recipes/images/b2qt-embedded-image.bb | |||
@@ -1,3 +1,25 @@ | |||
1 | ############################################################################# | ||
2 | ## | ||
3 | ## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). | ||
4 | ## | ||
5 | ## This file is part of the Qt Enterprise Embedded Scripts of the Qt | ||
6 | ## framework. | ||
7 | ## | ||
8 | ## $QT_BEGIN_LICENSE$ | ||
9 | ## Commercial License Usage Only | ||
10 | ## Licensees holding valid commercial Qt license agreements with Digia | ||
11 | ## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, | ||
12 | ## may use this file in accordance with the terms contained in said license | ||
13 | ## agreement. | ||
14 | ## | ||
15 | ## For further information use the contact form at | ||
16 | ## http://qt.digia.com/contact-us. | ||
17 | ## | ||
18 | ## | ||
19 | ## $QT_END_LICENSE$ | ||
20 | ## | ||
21 | ############################################################################# | ||
22 | |||
1 | DESCRIPTION = "B2Qt on embedded Linux SDK image" | 23 | DESCRIPTION = "B2Qt on embedded Linux SDK image" |
2 | LICENSE = "CLOSED" | 24 | LICENSE = "CLOSED" |
3 | PR = "r0" | 25 | PR = "r0" |
@@ -39,6 +61,7 @@ TOOLS_EXTRA_INSTALL = "\ | |||
39 | " | 61 | " |
40 | 62 | ||
41 | IMAGE_INSTALL += "\ | 63 | IMAGE_INSTALL += "\ |
64 | kernel-modules \ | ||
42 | psplash \ | 65 | psplash \ |
43 | openssh-sftp-server \ | 66 | openssh-sftp-server \ |
44 | openssl \ | 67 | openssl \ |
@@ -52,6 +75,8 @@ IMAGE_INSTALL += "\ | |||
52 | liberation-fonts \ | 75 | liberation-fonts \ |
53 | tslib \ | 76 | tslib \ |
54 | tslib-calibrate \ | 77 | tslib-calibrate \ |
78 | alsa-utils-amixer \ | ||
79 | hunspell \ | ||
55 | ${GSTREAMER_EXTRA_INSTALL} \ | 80 | ${GSTREAMER_EXTRA_INSTALL} \ |
56 | ${TOOLS_EXTRA_INSTALL} \ | 81 | ${TOOLS_EXTRA_INSTALL} \ |
57 | ${MACHINE_EXTRA_INSTALL} \ | 82 | ${MACHINE_EXTRA_INSTALL} \ |