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>

7 files changed, 13 insertions, 234 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"
diff --git a/recipes/gdb/gdb-cross-canadian_7.5.1.bbappend b/recipes/gdb/gdb-cross-canadian_7.5.1.bbappend
deleted file mode 100644
index f96bc35..0000000
--- a/recipes/gdb/gdb-cross-canadian_7.5.1.bbappend
+++ /dev/null
@@ -1,35 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
-##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://qt.digia.com/contact-us.
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-do_compile_prepend() {
-cat > ${WORKDIR}/python << EOF
-#! /bin/sh
-case "\$2" in
-        --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}/" ;;
-        --ldflags) echo "-Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.. -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;
-        --exec-prefix) echo "${exec_prefix}" ;;
-        *) exit 1 ;;
-esac
-exit 0
-EOF
-        chmod +x ${WORKDIR}/python
-}
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bbappend b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bbappend
deleted file mode 100644
index ccbbf8f..0000000
--- a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bbappend
+++ /dev/null
@@ -1,25 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
-##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://qt.digia.com/contact-us.
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-PROVIDES += "virtual/libgl"
-
-FILES_libegl-mx6-dev += "${includedir}/KHR ${includedir}/EGL"
diff --git a/recipes/mesa/mesa_9.1.3.bb b/recipes/mesa/mesa_9.1.3.bb
deleted file mode 100644
index 99c3a38..0000000
--- a/recipes/mesa/mesa_9.1.3.bb
+++ /dev/null
@@ -1,139 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
-##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://qt.digia.com/contact-us.
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-SUMMARY = "A free implementation of the OpenGL API"
-DESCRIPTION = "Mesa is an open-source implementation of the OpenGL specification - \
-a system for rendering interactive 3D graphics.  \
-A variety of device drivers allows Mesa to be used in many different environments \
-ranging from software emulation to complete hardware acceleration for modern GPUs. \
-Mesa is used as part of the overall Direct Rendering Infrastructure and X.org \
-environment."
-
-HOMEPAGE = "http://mesa3d.org"
-BUGTRACKER = "https://bugs.freedesktop.org"
-SECTION = "x11"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://docs/license.html;md5=42d77d95cba529a3637129be87d6555d"
-
-INC_PR = "r9"
-PE = "2"
-
-export WANT_LLVM_RELEASE = "3.2"
-
-DEPENDS = "expat makedepend-native flex-native bison-native llvm${WANT_LLVM_RELEASE}"
-
-PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"
-
-inherit autotools pkgconfig pythonnative
-
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
-           file://EGL-Mutate-NativeDisplayType-depending-on-config.patch \
-           file://fix-glsl-cross.patch \
-           file://0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch \
-           file://0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch \
-           file://0001-fix-xlib-dependency-from-pipe-loader.patch \
-           file://glapi.patch \
-           "
-
-SRC_URI[md5sum] = "952ccd03547ed72333b64e1746cf8ada"
-SRC_URI[sha256sum] = "8d5dac2202d0355bff5cfd183582ec8167d1d1227b7bb7a669acecbeaa52d766"
-
-S = "${WORKDIR}/Mesa-${PV}"
-
-EXTRA_OECONF = " \
-                --enable-opengl \
-                --enable-gles2 \
-                --enable-egl --with-egl-platforms=fbdev \
-                --enable-gallium --enable-gallium-llvm --enable-gallium-egl --with-llvm-shared-libs --with-gallium-drivers="swrast" \
-                --enable-shared-glapi \
-                --disable-glx \
-                --enable-dri --with-dri-drivers="" \
-                --disable-gles1 \
-                --disable-gles3 \
-                --disable-openvg \
-                "
-
-# llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2)
-FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer"
-
-# Multiple virtual/gl providers being built breaks staging
-EXCLUDE_FROM_WORLD = "1"
-
-# Remove the mesa dependency on mesa-dev, as mesa is empty
-RDEPENDS_${PN}-dev = ""
-
-PACKAGES =+ "libegl-mesa libegl-mesa-dev \
-             libglapi libglapi-dev \
-             libgles2-mesa libgles2-mesa-dev \
-             libegl-gallium \
-            "
-
-do_install_append () {
-    # Drivers never need libtool .la files
-    rm -f ${D}${libdir}/egl/*.la
-    rm -f ${D}${libdir}/gallium-pipe/*.la
-}
-
-# For the packages that make up the OpenGL interfaces, inject variables so that
-# they don't get Debian-renamed (which would remove the -mesa suffix), and
-# RPROVIDEs/RCONFLICTs on the generic libgl name.
-python __anonymous() {
-    for p in (("libegl", "libegl1"), ("libgl", "libgl1"),
-              ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"),
-              ("libgles3",)):
-        fullp = p[0] + "-mesa"
-        pkgs = " ".join(p)
-        d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
-        d.appendVar("RREPLACES_" + fullp, pkgs)
-        d.appendVar("RPROVIDES_" + fullp, pkgs)
-        d.appendVar("RCONFLICTS_" + fullp, pkgs)
-
-        # For -dev, the first element is both the Debian and original name
-        fullp += "-dev"
-        pkgs = p[0] + "-dev"
-        d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
-        d.appendVar("RREPLACES_" + fullp, pkgs)
-        d.appendVar("RPROVIDES_" + fullp, pkgs)
-        d.appendVar("RCONFLICTS_" + fullp, pkgs)
-}
-
-python mesa_populate_packages() {
-    pipe_drivers_root = os.path.join(d.getVar('libdir', True), "gallium-pipe")
-    do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='')
-}
-
-PACKAGESPLITFUNCS_prepend = "mesa_populate_packages "
-
-PACKAGES_DYNAMIC += "^mesa-driver-.*"
-
-FILES_libegl-mesa = "${libdir}/libEGL.so.*"
-FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"
-FILES_libglapi = "${libdir}/libglapi.so.*"
-FILES_libegl-gallium = "${libdir}/egl/egl_gallium.so* ${libdir}/egl/st_GL.so*"
-
-FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
-FILES_libglapi-dev = "${libdir}/libglapi.*"
-FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"
-
-FILES_${PN}-dbg += "${libdir}/egl/.debug/* ${libdir}/gallium-pipe/.debug"
-
-
diff --git a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb
index b37cad8..f9cded9 100644
--- a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb
+++ b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb
@@ -24,7 +24,7 @@ DESCRIPTION = "B2Qt on embedded Linux SDK toolchain"
 PR = "r0"
 LICENSE = "CLOSED"
 
-TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-b2qt-embedded-toolchain-host packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}"
+TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-b2qt-embedded-toolchain-host packagegroup-cross-canadian-${MACHINE}"
 TOOLCHAIN_TARGET_TASK = "nativesdk-packagegroup-b2qt-embedded-toolchain-target"
 
 require recipes-core/meta/meta-toolchain.bb
diff --git a/recipes/openssh/openssh_6.1p1.bbappend b/recipes/openssh/openssh_6.1p1.bbappend
deleted file mode 100644
index 7c35cd4..0000000
--- a/recipes/openssh/openssh_6.1p1.bbappend
+++ /dev/null
@@ -1,24 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
-##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://qt.digia.com/contact-us.
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-export libexecdir="/usr/libexec"
-
diff --git a/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch b/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch
index 3c65a20..9caee44 100644
--- a/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch
+++ b/recipes/u-boot/u-boot-script-boundary/0001-nitrogen6x-disable-console-cursor-blinking.patch
@@ -1,6 +1,6 @@
-From 6b894707404a1aeb3072d4b3bfc486ff9ad37ac4 Mon Sep 17 00:00:00 2001
+From d01717f74b5c8d62e93d29d03df0c49b67645d32 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@digia.com>
-Date: Tue, 9 Jul 2013 15:31:30 +0300
+Date: Mon, 16 Dec 2013 15:42:45 +0200
 Subject: [PATCH] nitrogen6x: disable console cursor blinking
 
 ---
@@ -8,17 +8,18 @@ Subject: [PATCH] nitrogen6x: disable console cursor blinking
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/board/boundary/nitrogen6x/6x_bootscript.txt b/board/boundary/nitrogen6x/6x_bootscript.txt
-index 1d766ca..80b91ea 100644
+index 9533713..2985af2 100644
 --- a/board/boundary/nitrogen6x/6x_bootscript.txt
 +++ b/board/boundary/nitrogen6x/6x_bootscript.txt
-@@ -53,6 +53,6 @@ done
+@@ -52,7 +52,7 @@ while test "4" -ne $nextcon ; do
+ done
  
  setenv bootargs $bootargs $fbmem
+-setenv bootargs "$bootargs console=ttymxc1,115200 vmalloc=400M consoleblank=0 rootwait"
++setenv bootargs "$bootargs console=ttymxc1,115200 vmalloc=400M consoleblank=0 vt.global_cursor_default=0 rootwait"
  
--setenv bootargs $bootargs console=ttymxc1,115200 vmalloc=400M root=/dev/mmcblk0p2 rootwait consoleblank=0 ;
-+setenv bootargs $bootargs console=ttymxc1,115200 vmalloc=400M root=/dev/mmcblk0p2 rootwait consoleblank=0 vt.global_cursor_default=0 ;
- ${fs}load mmc ${disk}:1 10800000 uImage && bootm 10800000 ; echo "Error loading kernel image"
- 
+ if itest.s x$bootpart == x ; then
+        bootpart=1
 -- 
 1.7.10.4