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 /conf/distro/b2qt.conf | |
| 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 'conf/distro/b2qt.conf')
| -rw-r--r-- | conf/distro/b2qt.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 66ddcf1..8819c93 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf | |||
| @@ -24,7 +24,7 @@ include conf/distro/poky.conf | |||
| 24 | 24 | ||
| 25 | DISTRO = "b2qt" | 25 | DISTRO = "b2qt" |
| 26 | DISTRO_NAME = "Boot to Qt for Embedded Linux" | 26 | DISTRO_NAME = "Boot to Qt for Embedded Linux" |
| 27 | DISTRO_VERSION = "1.5" | 27 | DISTRO_VERSION = "1.6" |
| 28 | SDK_VERSION := "${DISTRO_VERSION}" | 28 | SDK_VERSION := "${DISTRO_VERSION}" |
| 29 | 29 | ||
| 30 | MAINTAINER = "B2Qt <B2Qt@digia.com>" | 30 | MAINTAINER = "B2Qt <B2Qt@digia.com>" |
| @@ -39,7 +39,7 @@ include conf/distro/include/${MACHINE}.conf | |||
| 39 | 39 | ||
| 40 | SYSVINIT_ENABLED_GETTYS = "" | 40 | SYSVINIT_ENABLED_GETTYS = "" |
| 41 | 41 | ||
| 42 | DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc" | 42 | DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 largefile usbgadget usbhost wifi xattr nfs" |
| 43 | POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch" | 43 | POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch" |
| 44 | DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio" | 44 | DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio" |
| 45 | 45 | ||