diff options
author | Kalle Viironen <kalle.viironen@digia.com> | 2014-04-15 15:13:33 +0300 |
---|---|---|
committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-04-15 15:13:40 +0300 |
commit | bfb97bc3cc517c42647f5f8b1308bb7b1f4c76f1 (patch) | |
tree | 534bfaffc99f288f395297c625e284fea6e50401 /conf/distro/b2qt.conf | |
parent | a68e1ea9b2904f7c69330e534da877cf19376219 (diff) | |
parent | 03be9b83d45659d0d98fa1bf69853e0aa297ed32 (diff) | |
download | meta-boot2qt-QtEE_v2.1.0.tar.gz |
Merge branch 'stable' into releaseQtEE_v2.1.0
* stable:
wpa-supplicant: include headers and sources for external usage
bootfs: need to use fakeroot for tar'ing
sdk: include bluez4-dev package to sdk
Create boot.tar.gz as part of the image build
image: include CA certificates to image
adbd: use network connection in imx53qsb
sdk: libcap is required for QtWebEngine
Include licenses to the image
adbd: make switching between usb and ethernet easier
use package groups for image content
Create only tar.gz image type
Change from dylan to dora brach in README
mkcard: remove recipe for mkcard
Change-Id: Id56ca219d05f2f833a4de3fc3ca057c5cf50a562
Diffstat (limited to 'conf/distro/b2qt.conf')
-rw-r--r-- | conf/distro/b2qt.conf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index cde0b02..66ddcf1 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf | |||
@@ -46,3 +46,7 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio" | |||
46 | COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" | 46 | COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" |
47 | COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse" | 47 | COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse" |
48 | 48 | ||
49 | MACHINE_EXTRA_INSTALL ?= "" | ||
50 | |||
51 | LICENSE_CREATE_PACKAGE = "1" | ||
52 | COPY_LIC_MANIFEST = "1" | ||