Move to yocto 1.5 dora branch

Remove recipe appends that are fixed upstream and make
changes needed for 1.5 branch.

Tested and verified with nitrogen6x.

Change-Id: I7b8ca04f2f4523fa5113bbe43767e3e90f243cd9
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index 6dc189f..6dc96d2 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -24,7 +24,7 @@ include conf/distro/poky.conf
 
 DISTRO = "b2qt"
 DISTRO_NAME = "Boot to Qt for Embedded Linux"
-DISTRO_VERSION = "1.4"
+DISTRO_VERSION = "1.5"
 SDK_VERSION := "${DISTRO_VERSION}"
 
 MAINTAINER = "B2Qt <B2Qt@digia.com>"
@@ -38,7 +38,8 @@ include conf/distro/include/${MACHINE}.conf
 
 SYSVINIT_ENABLED_GETTYS = ""
 
-DISTRO_FEATURES ?= "alsa argp bluetooth ext2 largefile usbgadget usbhost wifi xattr nfs nfc ${DISTRO_FEATURES_LIBC}"
+DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc"
+POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
 
 COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse"