From 706fc1ceecaaefe5e6fd80db15bb3e8a98e3561d Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Tue, 17 Dec 2013 09:23:44 +0200
Subject: 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>
---
 conf/distro/b2qt.conf                              |   5 +-
 recipes/gdb/gdb-cross-canadian_7.5.1.bbappend      |  35 ------
 .../gpu-viv-bin-mx6q_1.1.0.bbappend                |  25 ----
 recipes/mesa/mesa_9.1.3.bb                         | 139 ---------------------
 recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb   |   2 +-
 recipes/openssh/openssh_6.1p1.bbappend             |  24 ----
 ...itrogen6x-disable-console-cursor-blinking.patch |  17 +--
 7 files changed, 13 insertions(+), 234 deletions(-)
 delete mode 100644 recipes/gdb/gdb-cross-canadian_7.5.1.bbappend
 delete mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bbappend
 delete mode 100644 recipes/mesa/mesa_9.1.3.bb
 delete mode 100644 recipes/openssh/openssh_6.1p1.bbappend

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
 
-- 
cgit v1.2.3-54-g00ecf


From 6c8d6e64fc933c0115948ae7293660df2e77649d Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Thu, 9 Jan 2014 15:31:54 +0200
Subject: toolchain: libudev-dev is no more, using udev-dev

Change-Id: I86fbd3c8e6c1f7311b1f1d7e9626239b0e22ea18
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
---
 .../nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb
index d56b5be..809a654 100644
--- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb
+++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb
@@ -44,7 +44,7 @@ RDEPENDS_${PN} += "\
     gst-plugins-base-dev \
     icu-dev \
     libxslt-dev \
-    libudev-dev \
+    udev-dev \
     tslib-dev \
     ${MACHINE_EXTRA_INSTALL_SDK} \
     "
-- 
cgit v1.2.3-54-g00ecf


From 71ce20d2adfb0a1d363d89e27d60c50e94b99bfb Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Fri, 10 Jan 2014 12:59:22 +0200
Subject: nitrogen6x boot script changed

Moving cursor blinking option to new file.

Change-Id: I9cdddebe66d891571a1f0ce87ccbb727edeb42d7
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
---
 ...0001-nitrogen6x-disable-console-cursor-blinking.patch | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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 9caee44..d97921c 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,17 +1,17 @@
-From d01717f74b5c8d62e93d29d03df0c49b67645d32 Mon Sep 17 00:00:00 2001
+From b21614109fb3cca15c4b0d296b3ab6cc1b778e3a Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@digia.com>
-Date: Mon, 16 Dec 2013 15:42:45 +0200
+Date: Fri, 10 Jan 2014 12:37:20 +0200
 Subject: [PATCH] nitrogen6x: disable console cursor blinking
 
 ---
- board/boundary/nitrogen6x/6x_bootscript.txt |    2 +-
+ board/boundary/nitrogen6x/6x_bootscript-yocto.txt |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/board/boundary/nitrogen6x/6x_bootscript.txt b/board/boundary/nitrogen6x/6x_bootscript.txt
-index 9533713..2985af2 100644
---- a/board/boundary/nitrogen6x/6x_bootscript.txt
-+++ b/board/boundary/nitrogen6x/6x_bootscript.txt
-@@ -52,7 +52,7 @@ while test "4" -ne $nextcon ; do
+diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
+index d933fa0..2d7c575 100644
+--- a/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
++++ b/board/boundary/nitrogen6x/6x_bootscript-yocto.txt
+@@ -56,7 +56,7 @@ while test "4" -ne $nextcon ; do
  done
  
  setenv bootargs $bootargs $fbmem
-- 
cgit v1.2.3-54-g00ecf


From f889d20d744d0dc2017d513ce7ea704cd2091046 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Wed, 15 Jan 2014 10:32:25 +0200
Subject: RPI: increase GPU memory to 128

Default GPU memory config is 64 MB, which was insufficient
for some of the B2Qt demos.

Task-number: QTEE-293
Change-Id: I6049c9577d1fea59619f07e9fc0ab4890f06a54b
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
---
 conf/distro/include/raspberrypi.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf
index d167c43..19b2fdd 100644
--- a/conf/distro/include/raspberrypi.conf
+++ b/conf/distro/include/raspberrypi.conf
@@ -34,3 +34,6 @@ MACHINE_EXTRA_INSTALL_SDK = " \
         "
 
 module_autoload_snd-bcm2835 = "snd-bcm2835"
+
+# additional memory for GPU
+GPU_MEM = "128"
-- 
cgit v1.2.3-54-g00ecf


From 0e3e98cc86d6256059cdc4353a99823b07dfe80d Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Mon, 20 Jan 2014 08:55:14 +0200
Subject: Add LinuxMint-16 as a tested platform

Change-Id: I2a242af4012e518958f15d1cf7912c097529f344
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
---
 conf/distro/b2qt.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index 6dc96d2..033ae54 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -32,6 +32,7 @@ MAINTAINER = "B2Qt <B2Qt@digia.com>"
 SANITY_TESTED_DISTROS += " \
             Ubuntu 11.04 \n \
             LinuxMint-14 \n \
+            LinuxMint-16 \n \
             "
 
 include conf/distro/include/${MACHINE}.conf
-- 
cgit v1.2.3-54-g00ecf


From 407bd82e446d121405af9186758aa6d10b907d9f Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Wed, 22 Jan 2014 11:54:39 +0200
Subject: Install all kernel modules

Instead of handpicking required modules, install all that are recommended.

Change-Id: I292f9136d5d04d2ffff51737d337e4ccd93fe1db
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
---
 recipes/images/b2qt-embedded-image.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb
index 40719eb..3d092af 100644
--- a/recipes/images/b2qt-embedded-image.bb
+++ b/recipes/images/b2qt-embedded-image.bb
@@ -61,6 +61,7 @@ TOOLS_EXTRA_INSTALL = "\
         "
 
 IMAGE_INSTALL += "\
+        kernel-modules \
         psplash \
         openssh-sftp-server \
         openssl \
-- 
cgit v1.2.3-54-g00ecf


From 79859333c1414f2a47a9dd4a0687bf6495f53e29 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Wed, 22 Jan 2014 12:20:59 +0200
Subject: rpi: disable bbappend from meta-raspberrypi

Now using meta-raspberrypi from master branch, but needed
to disable bbappend for mesa recipe which does not exist.

Change-Id: I8f3eab483ac0376285f056625f946d6b6c39f786
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
---
 conf/local.conf.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 5c298c4..f64c0b8 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -275,7 +275,7 @@ CONF_VERSION = "1"
 
 INHERIT += "rm_work"
 
-BBMASK = "meta-ti/recipes-misc"
+BBMASK = "meta-ti/recipes-misc|meta-raspberrypi/recipes-graphics/mesa/mesa_9.2.2.bbappend"
 ACCEPT_FSL_EULA = "1"
 LICENSE_FLAGS_WHITELIST = "commercial"
 
-- 
cgit v1.2.3-54-g00ecf


From c3918d45cd6ae9601d99bf695d8672f2fc7f1f1e Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Thu, 23 Jan 2014 16:00:10 +0200
Subject: gpu-viv-bin-mx6q: remove dependency to mesa

Change-Id: I8785150d8fcdf253483b13588e7382d0cd59b78d
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
---
 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend

diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend
new file mode 100644
index 0000000..bed361e
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend
@@ -0,0 +1 @@
+RDEPENDS_libgl-mx6-dev = ""
-- 
cgit v1.2.3-54-g00ecf


From 20a3734c0da057a51aadc89e3dba163367611dc5 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Thu, 23 Jan 2014 13:36:37 +0200
Subject: upgrade emulator components

- kernel 3.10
- LLVM 3.3
- mesa 9.1.6

Change-Id: Ib15c6826ab480e39e4efb7a16d42030b55ad6c3b
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
---
 classes/image-hdd.bbclass                  |  19 +--
 conf/distro/include/emulator.conf          |   2 +-
 conf/machine/emulator.conf                 |   1 -
 recipes/linux/linux-yocto_3.10.bbappend    |  29 ++++
 recipes/linux/linux-yocto_3.8.bbappend     |  28 ----
 recipes/llvm/llvm-common.bb                |  44 ------
 recipes/llvm/llvm-common/llvm-config       |  10 --
 recipes/llvm/llvm.inc                      | 226 -----------------------------
 recipes/llvm/llvm3.2/arm_fenv_uclibc.patch |  14 --
 recipes/llvm/llvm3.2_3.2.bb                | 127 ----------------
 recipes/mesa/mesa_9.1.6.bbappend           |   6 +
 11 files changed, 38 insertions(+), 468 deletions(-)
 create mode 100644 recipes/linux/linux-yocto_3.10.bbappend
 delete mode 100644 recipes/linux/linux-yocto_3.8.bbappend
 delete mode 100644 recipes/llvm/llvm-common.bb
 delete mode 100644 recipes/llvm/llvm-common/llvm-config
 delete mode 100644 recipes/llvm/llvm.inc
 delete mode 100644 recipes/llvm/llvm3.2/arm_fenv_uclibc.patch
 delete mode 100644 recipes/llvm/llvm3.2_3.2.bb
 create mode 100644 recipes/mesa/mesa_9.1.6.bbappend

diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass
index 123c417..fb59c20 100644
--- a/classes/image-hdd.bbclass
+++ b/classes/image-hdd.bbclass
@@ -29,32 +29,17 @@ SYSLINUX_PROMPT = "0"
 SYSLINUX_TIMEOUT = "1"
 SYSLINUX_LABELS = "boot"
 LABELS_append = " ${SYSLINUX_LABELS} "
+SYSLINUX_DEFAULT_CONSOLE = "console=ttyS0,115200"
 
 inherit image_types boot-directdisk
 
 create_hdd_image () {
-	ln -s ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd
+	ln -fs ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd
 }
 
 python do_hddimg() {
         bb.build.exec_func('create_hdd_image', d)
 }
 
-python build_syslinux_cfg_append () {
-    import re
-
-    try:
-        cfgfile = file(cfile, 'r+')
-    except OSError:
-        raise bb.build.funcFailed('Unable to open %s' % (cfile))
-
-    f_content = cfgfile.read()
-    f_content = re.sub('tty0', 'ttyS0,115200', f_content)
-
-    cfgfile.seek(0)
-    cfgfile.write(f_content)
-    cfgfile.close()
-}
-
 addtask hddimg after do_bootdirectdisk before do_build
 do_hddimg[nostamp] = "1"
diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf
index ce17052..d3d5efd 100644
--- a/conf/distro/include/emulator.conf
+++ b/conf/distro/include/emulator.conf
@@ -32,7 +32,7 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 kernel_autoload_snd-intel8x0 = "snd-intel8x0"
 
 MACHINE_EXTRA_INSTALL = "\
-        llvm3.2 \
+        llvm3.3 \
         libegl-mesa \
         libegl-gallium \
         libgles2-mesa \
diff --git a/conf/machine/emulator.conf b/conf/machine/emulator.conf
index 2aac3ab..f2628d5 100644
--- a/conf/machine/emulator.conf
+++ b/conf/machine/emulator.conf
@@ -29,7 +29,6 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
 PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.8%"
 
 require conf/machine/include/tune-i586.inc
 
diff --git a/recipes/linux/linux-yocto_3.10.bbappend b/recipes/linux/linux-yocto_3.10.bbappend
new file mode 100644
index 0000000..9cd7e69
--- /dev/null
+++ b/recipes/linux/linux-yocto_3.10.bbappend
@@ -0,0 +1,29 @@
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += "\
+    file://snd_intel8x0.cfg \
+    "
+
+KMACHINE_emulator = "qemux86"
+COMPATIBLE_MACHINE_emulator = "emulator"
diff --git a/recipes/linux/linux-yocto_3.8.bbappend b/recipes/linux/linux-yocto_3.8.bbappend
deleted file mode 100644
index fa6d5eb..0000000
--- a/recipes/linux/linux-yocto_3.8.bbappend
+++ /dev/null
@@ -1,28 +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$
-##
-#############################################################################
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "\
-    file://snd_intel8x0.cfg \
-    "
-
-COMPATIBLE_MACHINE += "|emulator"
diff --git a/recipes/llvm/llvm-common.bb b/recipes/llvm/llvm-common.bb
deleted file mode 100644
index 0e20600..0000000
--- a/recipes/llvm/llvm-common.bb
+++ /dev/null
@@ -1,44 +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$
-##
-#############################################################################
-
-DESCRIPTION = "Helper script for OE's llvm support"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \
-"
-
-SRC_URI = "file://llvm-config"
-
-ALLOW_EMPTY_${PN} = "1"
-SYSROOT_PREPROCESS_FUNCS_append_class-target = " llvm_common_sysroot_preprocess"
-
-llvm_common_sysroot_preprocess() {
-    install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
-    install -m 0755 ${WORKDIR}/llvm-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/
-}
-
-do_install_virtclass-native() {
-    install -d ${D}${bindir}
-    install -m 0755 ${WORKDIR}/llvm-config ${D}${bindir}
-}
-
-BBCLASSEXTEND = "native"
diff --git a/recipes/llvm/llvm-common/llvm-config b/recipes/llvm/llvm-common/llvm-config
deleted file mode 100644
index a9a416d..0000000
--- a/recipes/llvm/llvm-common/llvm-config
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# Wrapper script for real llvm-config. Simply calls
-
-if [ $WANT_LLVM_RELEASE ]; then
-	exec `dirname $0`/${TARGET_PREFIX}llvm-config$WANT_LLVM_RELEASE ${@}
-else
-  echo "The variable WANT_LLVM_RELEASE is not defined and exported"
-	echo "by your build recipe. Go figure."
-  exit 1
-fi
diff --git a/recipes/llvm/llvm.inc b/recipes/llvm/llvm.inc
deleted file mode 100644
index fcd2666..0000000
--- a/recipes/llvm/llvm.inc
+++ /dev/null
@@ -1,226 +0,0 @@
-# LLVM does not provide ABI stability between different versions. For this
-# reason OE makes it possible to build and install different llvm versions
-# at the same time.
-#
-# This is true for the normal recipes as well as the native ones.
-#
-# All regular installation directories are prefixed with 'llvm${LLVM_RELEASE}'
-# e.g. "${STAGING_BINDIR}/llvm2.5" or "${STAGING_INCDIR}/llvm2.5"
-#
-# For your program or library that makes use of llvm you do should not need to
-# modify anything as long as it uses the results of various llvm-config
-# invocations. If you need customizations something is wrong and it needs to be
-# fixed (report bug).
-#
-# However the *recipe* for your program/library *must* declare
-# export WANT_LLVM_RELEASE = "<valid version number>"
-# The version number is picked up by a generic wrapper script which just calls
-# the variant of the specified version.
-
-DESCRIPTION = "The Low Level Virtual Machine"
-HOMEPAGE = "http://llvm.org"
-# 3-clause BSD-like
-LICENSE = "NCSA"
-LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=0ac5f799a2d89477c75b0a378b221855"
-
-DEPENDS = "llvm${LLVM_RELEASE}-native llvm-common"
-DEPENDS_virtclass-native = "llvm-common-native cmake-native"
-
-INC_PR = "r2"
-
-SRC_URI = "http://llvm.org/releases/${PV}/llvm-${PV}.tgz"
-
-S = "${WORKDIR}/llvm-${PV}"
-
-inherit cmake perlnative pythonnative
-
-# Defines the LLVM supported arches. By now we always build either for ${BUILD}
-# (native) or ${TARGET}. In the future it may make sense to enable all backends
-# for the non-native build. The decision which backends are used is made by
-# the 3rd party program or library that uses llvm anyway.
-LLVM_ARCH = "${@get_llvm_arch(d)}"
-
-# This is used for generating the install directory for the llvm libraries,
-# binaries and headers. It makes side by side installation of those possible.
-LLVM_RELEASE = "${PV}"
-
-# llvm *must* be built out of tree
-OECMAKE_SOURCEPATH = ".."
-OECMAKE_BUILDPATH = "build"
-EXTRA_OECMAKE = "\
-    -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm${LLVM_RELEASE}/tblgen \
-    -DLLVM_TARGETS_TO_BUILD=${LLVM_ARCH} \
-    -DCMAKE_LINKER:FILEPATH=${LD} \
-    -DCMAKE_AR:FILEPATH=${AR} \
-    -DCMAKE_OBJCOPY:FILEPATH=${OBJCOPY} \
-    -DCMAKE_OBJDUMP:FILEPATH=${OBJDUMP} \
-    -DCMAKE_RANLIB:FILEPATH=${RANLIB} \
-    -DCMAKE_STRIP:FILEPATH=${STRIP} \
-    -DNM_PATH:FILEPATH=${NM} \
-    -DLLVM_ENABLE_PIC:BOOL=ON \
-    -DLLVM_TARGET_ARCH:STRING=${LLVM_ARCH} \
-    -DLLVM_ENABLE_ASSERTIONS:BOOL=ON \
-    -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
-    -DBUILD_SHARED_LIBS:BOOL=ON \
-    -DCMAKE_SKIP_BUILD_RPATH:BOOL=ON \
-"
-# We need to reset this to avoid breakage as we build out of tree
-TOOLCHAIN_OPTIONS = ""
-
-PACKAGES_DYNAMIC = "llvm-*"
-
-# the difference to the non-native build is that we do not need
-# to declare the location of the tblgen executable.
-EXTRA_OECMAKE_virtclass-native = "\
-    -DLLVM_TARGETS_TO_BUILD=${LLVM_ARCH} \
-    -DCMAKE_LINKER:FILEPATH=${LD} \
-    -DCMAKE_AR:FILEPATH=${AR} \
-    -DCMAKE_OBJCOPY:FILEPATH=${OBJCOPY} \
-    -DCMAKE_OBJDUMP:FILEPATH=${OBJDUMP} \
-    -DCMAKE_RANLIB:FILEPATH=${RANLIB} \
-    -DCMAKE_STRIP:FILEPATH=${STRIP} \
-    -DNM_PATH:FILEPATH=${NM} \
-"
-
-PACKAGES_virtclass-native = ""
-
-PACKAGES_DYNAMIC_virtclass-native = ""
-
-python populate_packages_prepend () {
-    libllvm_libdir = bb.data.expand('${libdir}/llvm${LLVM_RELEASE}', d)
-    do_split_packages(d, libllvm_libdir, '^lib(.*)\.so$', 'libllvm-%s', 'Split package for %s', allow_dirs=True)
-}
-
-FILES_${PN} = ""
-ALLOW_EMPTY_${PN} = "1"
-
-FILES_${PN}-dbg += "${libdir}/llvm${LLVM_RELEASE}/.debug ${bindir}/llvm${LLVM_RELEASE}/.debug"
-
-FILES_${PN}-dev = " \
-                   ${includedir} \
-                   ${bindir}/* \
-                   ${libdir}/llvm${LLVM_RELEASE}/LLVMHello.so \
-                   ${libdir}/llvm${LLVM_RELEASE}/BugpointPasses.so \
-                   ${libdir}/llvm${LLVM_RELEASE}/*.a \
-"
-
-base_do_compile_prepend() {
-    # Avoid *** No rule to make target `native/bin/tblgen', needed by `include/llvm/Intrinsics.gen.tmp'
-    oe_runmake tblgen
-}
-
-do_install() {
-    # Install into a private directory to be able to reorganize the files.
-
-    cd ${OECMAKE_BUILDPATH}
-
-    oe_runmake DESTDIR=${WORKDIR}/llvm-install install
-
-    # Create our custom target directories
-    install -d ${D}${bindir}/llvm${LLVM_RELEASE}
-    install -d ${D}${includedir}/llvm${LLVM_RELEASE}
-    install -d ${D}${libdir}/llvm${LLVM_RELEASE}
-
-    #    Move headers into their own directory
-    cp -R ${WORKDIR}/llvm-install/${prefix}/include/llvm \
-    ${D}${includedir}/llvm${LLVM_RELEASE}/
-    cp -R ${WORKDIR}/llvm-install/${prefix}/include/llvm-c \
-    ${D}${includedir}/llvm${LLVM_RELEASE}/
-
-    find ${WORKDIR}/llvm-install/${prefix}/lib -name "*" -maxdepth 1 -exec \
-    install {} ${D}${libdir}/llvm${LLVM_RELEASE} \;
-
-    #    I dont know another way out. Binaries are installed into a special subdir
-    find ${WORKDIR}/llvm-install/${prefix}/bin -name "*" -maxdepth 1 -exec \
-    install {} ${D}${bindir}/llvm${LLVM_RELEASE} \;
-
-    # LLVM does not install this by default.
-    install bin/tblgen ${D}${bindir}/llvm${LLVM_RELEASE}
-
-        # we install it here unmodified for native and none native and overwrite it
-        # later for native case
-        install -d ${D}${bindir}
-        install -m 0755 bin/llvm-config ${D}${bindir}
-}
-
-SYSROOT_PREPROCESS_FUNCS_append_class-target = " llvm_sysroot_preprocess"
-
-llvm_sysroot_preprocess() {
-    cd ${OECMAKE_BUILDPATH}
-
-    # Fix the paths in the config script to make it find the binaries and
-    # library files. Doing so allows 3rd party configure scripts working
-    # unmodified.
-    sed -e's!my.*ABS_RUN_DIR =.*!my $ABS_RUN_DIR = "${STAGING_DIR_TARGET}";!' \
-        -e's!my.*INCLUDEDIR =.*!my $INCLUDEDIR = "${STAGING_INCDIR}/llvm${LLVM_RELEASE}";!' \
-        -e's!my.*LIBDIR.*!my $LIBDIR = "${STAGING_LIBDIR}/llvm${LLVM_RELEASE}";!' \
-        -e's!my.*BINDIR.*!my $BINDIR = "${STAGING_BINDIR}/llvm${LLVM_RELEASE}";!' \
-        bin/llvm-config > bin/llvm-config${LLVM_RELEASE}
-
-        install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}
-        install -m 0755 bin/llvm-config${LLVM_RELEASE} ${SYSROOT_DESTDIR}${bindir_crossscripts}
-}
-
-do_install_virtclass-native() {
-    # Install into a private directory to be able to reorganize the files.
-
-        cd ${OECMAKE_BUILDPATH}
-
-        oe_runmake DESTDIR=${WORKDIR}/llvm-install install
-
-    # Create our custom target directories
-    install -d ${D}${bindir}/llvm${LLVM_RELEASE}
-    install -d ${D}${includedir}/llvm${LLVM_RELEASE}
-    install -d ${D}${libdir}/llvm${LLVM_RELEASE}
-
-    #    Move headers into their own directory
-    cp -R ${WORKDIR}/llvm-install/${prefix}/include/llvm \
-    ${D}${includedir}/llvm${LLVM_RELEASE}/
-    cp -R ${WORKDIR}/llvm-install/${prefix}/include/llvm-c \
-    ${D}${includedir}/llvm${LLVM_RELEASE}/
-
-    find ${WORKDIR}/llvm-install/${prefix}/lib -name "*" -maxdepth 1 -exec \
-    install {} ${D}${libdir}/llvm${LLVM_RELEASE} \;
-
-    #    I dont know another way out. Binaries are installed into a special subdir
-    find ${WORKDIR}/llvm-install/${prefix}/bin -name "*" -maxdepth 1 -exec \
-    install {} ${D}${bindir}/llvm${LLVM_RELEASE} \;
-
-    # LLVM does not install this by default.
-    install bin/tblgen ${D}${bindir}/llvm${LLVM_RELEASE}
-
-    # Fix the paths in the config script to make it find the binaries and
-    # library files. Doing so allows 3rd party configure scripts working
-    # unmodified.
-    sed -e's!my.*ABS_RUN_DIR =.*!my $ABS_RUN_DIR = "${STAGING_DIR_TARGET}";!' \
-        -e's!my.*INCLUDEDIR =.*!my $INCLUDEDIR = "${STAGING_INCDIR}/llvm${LLVM_RELEASE}";!' \
-        -e's!my.*LIBDIR.*!my $LIBDIR = "${STAGING_LIBDIR}/llvm${LLVM_RELEASE}";!' \
-        -e's!my.*BINDIR.*!my $BINDIR = "${STAGING_BINDIR}/llvm${LLVM_RELEASE}";!' \
-        bin/llvm-config > bin/llvm-config${LLVM_RELEASE}
-
-        install -d ${D}${bindir}
-        install -m 0755 bin/llvm-config${LLVM_RELEASE} ${D}${bindir}
-}
-
-
-# Retrieve the target in a way that is compatible to the arch
-# value in llvm (>= 2.5)
-def get_llvm_arch(d):
-    import bb;
-
-    arch = bb.data.getVar('TARGET_ARCH', d, 1)
-    if arch == "x86_64" or arch == "i486" or arch == "i586" or arch == "i686":
-        arch = "X86"
-    elif arch == "arm":
-        arch = "ARM"
-    elif arch == "mipsel" or arch == "mips":
-        arch = "mips"
-    elif arch == "powerpc" or arch == "powerpc64":
-        arch = "PowerPC"
-    else:
-        bb.warn("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) );
-
-    return arch
-
-BBCLASSEXTEND = "native"
-
diff --git a/recipes/llvm/llvm3.2/arm_fenv_uclibc.patch b/recipes/llvm/llvm3.2/arm_fenv_uclibc.patch
deleted file mode 100644
index c3ae494..0000000
--- a/recipes/llvm/llvm3.2/arm_fenv_uclibc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: llvm-2.9/include/llvm/Support/FEnv.h
-===================================================================
---- llvm-2.9.orig/include/llvm/Support/FEnv.h	2010-11-29 20:44:50.000000000 +0100
-+++ llvm-2.9/include/llvm/Support/FEnv.h	2011-11-18 18:42:22.580161297 +0100
-@@ -17,6 +17,9 @@
- 
- #include "llvm/Config/config.h"
- #include <cerrno>
-+
-+#undef HAVE_FENV_H
-+
- #ifdef HAVE_FENV_H
- #include <fenv.h>
- #endif
diff --git a/recipes/llvm/llvm3.2_3.2.bb b/recipes/llvm/llvm3.2_3.2.bb
deleted file mode 100644
index 92b62f9..0000000
--- a/recipes/llvm/llvm3.2_3.2.bb
+++ /dev/null
@@ -1,127 +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$
-##
-#############################################################################
-
-DESCRIPTION = "The Low Level Virtual Machine"
-HOMEPAGE = "http://llvm.org"
-# 3-clause BSD-like
-LICENSE = "NCSA"
-LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=60fdd7739841f04a2ce2171a726be8f3"
-
-DEPENDS = "libffi libxml2-native llvm-common"
-
-SRC_URI = "http://llvm.org/releases/${PV}/llvm-${PV}.src.tar.gz"
-SRC_URI_append_libc-uclibc = " file://arm_fenv_uclibc.patch "
-
-SRC_URI[md5sum] = "71610289bbc819e3e15fdd562809a2d7"
-SRC_URI[sha256sum] = "125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343"
-
-S = "${WORKDIR}/llvm-${PV}.src"
-
-inherit autotools perlnative pythonnative
-
-LLVM_BUILD_DIR = "${WORKDIR}/llvm-${PV}.build"
-LLVM_INSTALL_DIR = "${WORKDIR}/llvm-install"
-LLVM_DIR = "llvm${PV}"
-
-EXTRA_OECONF += "--disable-assertions \
-                 --enable-debug-runtime \
-                 --disable-expensive-checks \
-                 --enable-bindings=none \
-                 --enable-keep-symbols \
-                 --enable-libffi \
-                 --enable-optimized \
-                 --enable-shared \
-                 --enable-targets=host-only"
-EXTRA_OEMAKE += "REQUIRES_RTTI=1 VERBOSE=1"
-FILES_${PN} = "${libdir}/lib*.so \
-               ${libdir}/${LLVM_DIR}/*"
-FILES_${PN}-dbg = "${bindir}/${LLVM_DIR}/.debug \
-                   ${libdir}/${LLVM_DIR}/.debug \
-                   ${libdir}/.debug \
-                   /usr/src/debug"
-FILES_${PN}-dev = "${bindir}/${LLVM_DIR} \
-                   ${includedir}/${LLVM_DIR} \
-                   ${libdir}/${LLVM_DIR}/BugpointPasses.so \
-                   ${libdir}/${LLVM_DIR}/LLVMHello.so"
-FILES_${PN}-static-dev = "${libdir}/${LLVM_DIR}/*.a"
-FILES_SOLIBSDEV = ""
-INSANE_SKIP_${PN} = "dev-so"
-
-do_configure_prepend() {
-	# Remove RPATHs
-	sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules
-
-	# Drop "svn" suffix from version string
-	sed -i 's/3\.2svn/3.2/g' configure
-
-	# Fix paths in llvm-config
-	sed -i "s|sys::path::parent_path(CurrentPath))\.str()|sys::path::parent_path(sys::path::parent_path(CurrentPath))).str()|g" tools/llvm-config/llvm-config.cpp
-	sed -ri "s#/(bin|include|lib)(/?\")#/\1/${LLVM_DIR}\2#g" tools/llvm-config/llvm-config.cpp
-
-	# Fails to build unless using separate directory from source
-	mkdir -p ${LLVM_BUILD_DIR}
-	cd ${LLVM_BUILD_DIR}
-}
-
-do_compile() {
-	cd ${LLVM_BUILD_DIR}
-	oe_runmake \
-		AR="${BUILD_AR}" \
-		CC="${BUILD_CC}" \
-		CFLAGS="${BUILD_CFLAGS}" \
-		CXX="${BUILD_CXX}" \
-		CXXFLAGS="${BUILD_CXXFLAGS}" \
-		CPP="${BUILD_CPP}" \
-		CPPFLAGS="${BUILD_CPPFLAGS}" \
-		NM="${BUILD_NM}" \
-		RANLIB="${BUILD_RANLIB}" \
-		PATH="${STAGING_BINDIR_NATIVE}:$PATH" \
-		cross-compile-build-tools
-	oe_runmake
-}
-
-do_install() {
-	cd ${LLVM_BUILD_DIR}
-	oe_runmake DESTDIR=${LLVM_INSTALL_DIR} install
-
-	mv ${LLVM_INSTALL_DIR}${bindir}/${HOST_SYS}-llvm-config-host ${LLVM_INSTALL_DIR}/llvm-config-host
-
-	install -d ${D}${bindir}/${LLVM_DIR}
-	mv ${LLVM_INSTALL_DIR}${bindir}/* ${D}${bindir}/${LLVM_DIR}/
-
-	install -d ${D}${includedir}/${LLVM_DIR}
-	mv ${LLVM_INSTALL_DIR}${includedir}/* ${D}${includedir}/${LLVM_DIR}/
-
-	install -d ${D}${libdir}/${LLVM_DIR}
-	mv ${LLVM_INSTALL_DIR}${libdir}/* ${D}${libdir}/${LLVM_DIR}/
-	ln -s ${LLVM_DIR}/libLLVM-${PV}.so ${D}${libdir}/libLLVM-${PV}.so
-
-	install -d ${D}${docdir}/${LLVM_DIR}
-	mv ${LLVM_INSTALL_DIR}${prefix}/docs/llvm/* ${D}${docdir}/${LLVM_DIR}
-}
-
-SYSROOT_PREPROCESS_FUNCS += "llvm_sysroot_preprocess"
-
-llvm_sysroot_preprocess() {
-	install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}
-	mv ${LLVM_INSTALL_DIR}/llvm-config-host ${SYSROOT_DESTDIR}${bindir_crossscripts}/llvm-config${PV}
-}
diff --git a/recipes/mesa/mesa_9.1.6.bbappend b/recipes/mesa/mesa_9.1.6.bbappend
new file mode 100644
index 0000000..6c11709
--- /dev/null
+++ b/recipes/mesa/mesa_9.1.6.bbappend
@@ -0,0 +1,6 @@
+EGL_PLATFORMS = "fbdev"
+PACKAGECONFIG = "egl gles dri gallium gallium-llvm gallium-egl"
+GALLIUMDRIVERS_LLVM = ""
+DRIDRIVERS_remove = "swrast,radeon,r200,nouveau,i965,i915"
+DRIDRIVERS_append += "swrast"
+EXTRA_OECONF += "--with-dri-drivers="""
-- 
cgit v1.2.3-54-g00ecf


From f9d3810c97a637bea23b36c71aafcd00b01670d6 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Thu, 23 Jan 2014 13:37:29 +0200
Subject: Recipe for hunspell

Add new recipe for hunspell and include it to image and toolchain

Change-Id: I724aca8e3da378a0b59e57a0b00f03e9137b48f0
Reviewed-by: Rainer Keller <rainer.keller@digia.com>
---
 recipes/hunspell/hunspell_1.3.2.bb                 | 51 ++++++++++++++++++++++
 recipes/images/b2qt-embedded-image.bb              |  1 +
 ...-packagegroup-b2qt-embedded-toolchain-target.bb |  1 +
 3 files changed, 53 insertions(+)
 create mode 100644 recipes/hunspell/hunspell_1.3.2.bb

diff --git a/recipes/hunspell/hunspell_1.3.2.bb b/recipes/hunspell/hunspell_1.3.2.bb
new file mode 100644
index 0000000..c9d6aba
--- /dev/null
+++ b/recipes/hunspell/hunspell_1.3.2.bb
@@ -0,0 +1,51 @@
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+DESCRIPTION = "Hunspell"
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/hunspell-${PV}/COPYING;md5=ed3a37b3ba6d6be3e08ab45987cf1b88"
+
+SRC_URI = "http://downloads.sourceforge.net/hunspell/hunspell-${PV}.tar.gz \
+           http://ftp.halifax.rwth-aachen.de/gentoo/distfiles/myspell-en_GB-20081002.zip \
+           http://downloads.sourceforge.net/project/ayaspell/hunspell-ar/20080110/hunspell-ar_20080110.tar.gz \
+          "
+
+SRC_URI[md5sum] = "69990932920960eb765fd35883640124"
+SRC_URI[sha256sum] = "88d9eebbe05de29d17f4420ebaec9249441ce01d61b5d6c7ecba040e250e2d91"
+
+PR = "r0"
+
+inherit autotools gettext
+
+PACKAGES += "${PN}-dicts"
+RRECOMMENDS_${PN} += "${PN}-dicts"
+FILES_${PN}-dicts = "${datadir}/hunspell"
+
+do_install_append() {
+	install -m 0755 -d ${D}${datadir}/hunspell
+
+	install -m 0755 ${WORKDIR}/hunspell-ar_20080110/ar.dic ${D}${datadir}/hunspell/ar_EG.dic
+	install -m 0755 ${WORKDIR}/hunspell-ar_20080110/ar.aff ${D}${datadir}/hunspell/ar_EG.aff
+
+	install -m 0755 ${WORKDIR}/en_GB.dic ${D}${datadir}/hunspell
+	install -m 0755 ${WORKDIR}/en_GB.aff ${D}${datadir}/hunspell
+}
diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb
index 3d092af..e7811cc 100644
--- a/recipes/images/b2qt-embedded-image.bb
+++ b/recipes/images/b2qt-embedded-image.bb
@@ -76,6 +76,7 @@ IMAGE_INSTALL += "\
         tslib \
         tslib-calibrate \
         alsa-utils-amixer \
+        hunspell \
         ${GSTREAMER_EXTRA_INSTALL} \
         ${TOOLS_EXTRA_INSTALL} \
         ${MACHINE_EXTRA_INSTALL} \
diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb
index 809a654..58bed38 100644
--- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb
+++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb
@@ -46,5 +46,6 @@ RDEPENDS_${PN} += "\
     libxslt-dev \
     udev-dev \
     tslib-dev \
+    hunspell-dev \
     ${MACHINE_EXTRA_INSTALL_SDK} \
     "
-- 
cgit v1.2.3-54-g00ecf


From 653b6af852fad5b715a11a71a5404505268a6598 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Wed, 22 Jan 2014 12:08:51 +0200
Subject: Add support for BeagleBone Black

Change-Id: I1f30b93c6e3473a00a0a851f5fceccae90ba2f1b
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
---
 conf/distro/include/beaglebone.conf                | 35 ++++++++++++++++
 recipes/libgles/libgles-omap3_5.00.00.01.bbappend  | 48 ++++++++++++++++++++++
 recipes/libgles/libgles-omap3_5.01.00.01.bbappend  | 44 ++++++++++++++++++++
 recipes/linux/linux-ti-staging_3.12.bbappend       |  1 +
 .../0001-BBB-disable-console-cursor-blinking.patch | 25 +++++++++++
 recipes/u-boot/u-boot-ti-staging_2013.10.bbappend  | 26 ++++++++++++
 6 files changed, 179 insertions(+)
 create mode 100644 conf/distro/include/beaglebone.conf
 create mode 100644 recipes/libgles/libgles-omap3_5.00.00.01.bbappend
 create mode 100644 recipes/libgles/libgles-omap3_5.01.00.01.bbappend
 create mode 100644 recipes/linux/linux-ti-staging_3.12.bbappend
 create mode 100644 recipes/u-boot/u-boot-ti-staging/0001-BBB-disable-console-cursor-blinking.patch
 create mode 100644 recipes/u-boot/u-boot-ti-staging_2013.10.bbappend

diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf
new file mode 100644
index 0000000..528b41d
--- /dev/null
+++ b/conf/distro/include/beaglebone.conf
@@ -0,0 +1,35 @@
+############################################################################
+##
+## Copyright (C) 2013 Digia Plc
+## All rights reserved.
+## For any questions to Digia, please use contact form at http://qt.digia.com
+##
+## This file is part of QtEnterprise Embedded.
+##
+## Licensees holding valid Qt Enterprise licenses may use this file in
+## accordance with the Qt Enterprise License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Digia.
+##
+## If you have questions regarding the use of this file, please use
+## contact form at http://qt.digia.com
+##
+############################################################################
+IMAGE_FSTYPES = "tar.gz"
+
+PREFERRED_PROVIDER_virtual/libgl = "libgles-omap3"
+PREFERRED_VERSION_libgles-omap3 = "5.01.00.01"
+PREFERRED_VERSION_omap3-sgx-modules = "5.01.00.01"
+
+MACHINE_EXTRA_INSTALL = "\
+        libgles-omap3 \
+        libgles-omap3-rawdemos \
+        "
+
+MACHINE_EXTRA_INSTALL_SDK = "\
+        libgles-omap3-dev \
+        "
+
+ADB_PRODUCTID = "0xD002"
+
+DEFAULTTUNE = "armv7ahf-neon"
diff --git a/recipes/libgles/libgles-omap3_5.00.00.01.bbappend b/recipes/libgles/libgles-omap3_5.00.00.01.bbappend
new file mode 100644
index 0000000..1398af0
--- /dev/null
+++ b/recipes/libgles/libgles-omap3_5.00.00.01.bbappend
@@ -0,0 +1,48 @@
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+BINLOCATION_omap3  = "${S}/gfx_rel_es5.x"
+BINLOCATION_beaglebone  = "${S}/gfx_rel_es8.x"
+
+PROVIDES += "virtual/libgl"
+
+LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1"
+
+do_install_append() {
+	echo "ParamBufferSize=33554432" >> ${D}${sysconfdir}/powervr.ini
+}
+
+# Inhibit warnings about files being stripped.
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
+pkg_postinst_${PN}_append() {
+ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' )
+echo ${ESREV} > $D${sysconfdir}/powervr-esrev
+}
+
+RRECOMMENDS_${PN} = "omap3-sgx-modules"
+RRECOMMENDS_${PN}-blitwsegl = ""
+RRECOMMENDS_${PN}-flipwsegl = ""
+RRECOMMENDS_${PN}-frontwsegl = ""
+RRECOMMENDS_${PN}-linuxfbwsegl = ""
diff --git a/recipes/libgles/libgles-omap3_5.01.00.01.bbappend b/recipes/libgles/libgles-omap3_5.01.00.01.bbappend
new file mode 100644
index 0000000..17666cb
--- /dev/null
+++ b/recipes/libgles/libgles-omap3_5.01.00.01.bbappend
@@ -0,0 +1,44 @@
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+BINLOCATION_omap3  = "${S}/gfx_rel_es5.x"
+BINLOCATION_beaglebone  = "${S}/gfx_rel_es8.x"
+
+PROVIDES += "virtual/libgl"
+
+LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1"
+
+# Inhibit warnings about files being stripped.
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
+pkg_postinst_${PN}_append() {
+ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' )
+echo ${ESREV} > $D${sysconfdir}/powervr-esrev
+}
+
+RRECOMMENDS_${PN} = "omap3-sgx-modules"
+RRECOMMENDS_${PN}-blitwsegl = ""
+RRECOMMENDS_${PN}-flipwsegl = ""
+RRECOMMENDS_${PN}-frontwsegl = ""
+RRECOMMENDS_${PN}-linuxfbwsegl = ""
diff --git a/recipes/linux/linux-ti-staging_3.12.bbappend b/recipes/linux/linux-ti-staging_3.12.bbappend
new file mode 100644
index 0000000..5bc8967
--- /dev/null
+++ b/recipes/linux/linux-ti-staging_3.12.bbappend
@@ -0,0 +1 @@
+KERNEL_DEVICETREE_b2qt = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335x-boneblack.dtb"
diff --git a/recipes/u-boot/u-boot-ti-staging/0001-BBB-disable-console-cursor-blinking.patch b/recipes/u-boot/u-boot-ti-staging/0001-BBB-disable-console-cursor-blinking.patch
new file mode 100644
index 0000000..25dd9e4
--- /dev/null
+++ b/recipes/u-boot/u-boot-ti-staging/0001-BBB-disable-console-cursor-blinking.patch
@@ -0,0 +1,25 @@
+From bde714b9bfeafe46abc1078c09f6efac0e7b6478 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@digia.com>
+Date: Wed, 22 Jan 2014 11:30:59 +0200
+Subject: [PATCH] BBB: disable console cursor blinking
+
+---
+ include/configs/am335x_evm.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
+index d53f17d..1b3d2a4 100644
+--- a/include/configs/am335x_evm.h
++++ b/include/configs/am335x_evm.h
+@@ -59,6 +59,8 @@
+ 	"ramrootfstype=ext2\0" \
+ 	"mmcargs=setenv bootargs console=${console} " \
+ 		"${optargs} " \
++		"consoleblank=0 " \
++		"vt.global_cursor_default=0 " \
+ 		"root=${mmcroot} " \
+ 		"rootfstype=${mmcrootfstype}\0" \
+ 	"spiroot=/dev/mtdblock4 rw\0" \
+-- 
+1.8.3.2
+
diff --git a/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend b/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend
new file mode 100644
index 0000000..8caf0c5
--- /dev/null
+++ b/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend
@@ -0,0 +1,26 @@
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += " \
+        file://0001-BBB-disable-console-cursor-blinking.patch \
+        "
-- 
cgit v1.2.3-54-g00ecf


From 1fa91d356dc0108902f9dde52d25f124bfe40e3c Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Thu, 30 Jan 2014 13:18:44 +0200
Subject: udev: disable udev-cache on beaglebone

With udev-cache enabled, usb kernel modules were not loaded.

Change-Id: I11e5bec4a5b7aa1be30ecb016911a86ab1431dbb
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
---
 recipes/udev/0001-support-multitouch-screens.patch | 28 ----------------------
 .../udev/0001-support-multitouch-screens.patch     | 28 ++++++++++++++++++++++
 recipes/udev/udev/beaglebone/udev-cache.default    |  4 ++++
 recipes/udev/udev_182.bbappend                     |  2 +-
 4 files changed, 33 insertions(+), 29 deletions(-)
 delete mode 100644 recipes/udev/0001-support-multitouch-screens.patch
 create mode 100644 recipes/udev/udev/0001-support-multitouch-screens.patch
 create mode 100644 recipes/udev/udev/beaglebone/udev-cache.default

diff --git a/recipes/udev/0001-support-multitouch-screens.patch b/recipes/udev/0001-support-multitouch-screens.patch
deleted file mode 100644
index aacb8e0..0000000
--- a/recipes/udev/0001-support-multitouch-screens.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 51a9f15b10357a4ad1d8b2e50ec14031f68c0d48 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@digia.com>
-Date: Fri, 12 Apr 2013 09:41:41 +0300
-Subject: [PATCH] support multitouch screens
-
----
- src/udev-builtin-input_id.c |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/udev-builtin-input_id.c b/src/udev-builtin-input_id.c
-index a062ef7..0c5358e 100644
---- a/src/udev-builtin-input_id.c
-+++ b/src/udev-builtin-input_id.c
-@@ -108,8 +108,9 @@ static void test_pointers (struct udev_device *dev,
-                 return;
-         }
- 
--        if (test_bit (EV_ABS, bitmask_ev) &&
--            test_bit (ABS_X, bitmask_abs) && test_bit (ABS_Y, bitmask_abs)) {
-+        if (test_bit (EV_ABS, bitmask_ev) && (
-+            (test_bit (ABS_X, bitmask_abs) && test_bit (ABS_Y, bitmask_abs)) ||
-+            (test_bit (ABS_MT_POSITION_X, bitmask_abs) && test_bit (ABS_MT_POSITION_Y, bitmask_abs)))) {
-                 if (test_bit (BTN_STYLUS, bitmask_key) || test_bit (BTN_TOOL_PEN, bitmask_key))
-                         udev_builtin_add_property(dev, test, "ID_INPUT_TABLET", "1");
-                 else if (test_bit (BTN_TOOL_FINGER, bitmask_key) && !test_bit (BTN_TOOL_PEN, bitmask_key))
--- 
-1.7.10.4
-
diff --git a/recipes/udev/udev/0001-support-multitouch-screens.patch b/recipes/udev/udev/0001-support-multitouch-screens.patch
new file mode 100644
index 0000000..aacb8e0
--- /dev/null
+++ b/recipes/udev/udev/0001-support-multitouch-screens.patch
@@ -0,0 +1,28 @@
+From 51a9f15b10357a4ad1d8b2e50ec14031f68c0d48 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@digia.com>
+Date: Fri, 12 Apr 2013 09:41:41 +0300
+Subject: [PATCH] support multitouch screens
+
+---
+ src/udev-builtin-input_id.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/udev-builtin-input_id.c b/src/udev-builtin-input_id.c
+index a062ef7..0c5358e 100644
+--- a/src/udev-builtin-input_id.c
++++ b/src/udev-builtin-input_id.c
+@@ -108,8 +108,9 @@ static void test_pointers (struct udev_device *dev,
+                 return;
+         }
+ 
+-        if (test_bit (EV_ABS, bitmask_ev) &&
+-            test_bit (ABS_X, bitmask_abs) && test_bit (ABS_Y, bitmask_abs)) {
++        if (test_bit (EV_ABS, bitmask_ev) && (
++            (test_bit (ABS_X, bitmask_abs) && test_bit (ABS_Y, bitmask_abs)) ||
++            (test_bit (ABS_MT_POSITION_X, bitmask_abs) && test_bit (ABS_MT_POSITION_Y, bitmask_abs)))) {
+                 if (test_bit (BTN_STYLUS, bitmask_key) || test_bit (BTN_TOOL_PEN, bitmask_key))
+                         udev_builtin_add_property(dev, test, "ID_INPUT_TABLET", "1");
+                 else if (test_bit (BTN_TOOL_FINGER, bitmask_key) && !test_bit (BTN_TOOL_PEN, bitmask_key))
+-- 
+1.7.10.4
+
diff --git a/recipes/udev/udev/beaglebone/udev-cache.default b/recipes/udev/udev/beaglebone/udev-cache.default
new file mode 100644
index 0000000..d0050b8
--- /dev/null
+++ b/recipes/udev/udev/beaglebone/udev-cache.default
@@ -0,0 +1,4 @@
+# Default for /etc/init.d/udev
+
+# Comment this out to disable device cache
+#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev_182.bbappend b/recipes/udev/udev_182.bbappend
index 761d792..970f8fb 100644
--- a/recipes/udev/udev_182.bbappend
+++ b/recipes/udev/udev_182.bbappend
@@ -20,7 +20,7 @@
 ##
 #############################################################################
 
-FILESEXTRAPATHS_prepend := "${THISDIR}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://0001-support-multitouch-screens.patch"
 
-- 
cgit v1.2.3-54-g00ecf


From 4caaf27fd9b82092b0e4f378806be348b9aa61fe Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Wed, 22 Jan 2014 11:53:17 +0200
Subject: adb: use modprobe to load dependency modules
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I311b4945aff87b0851bc2da719025e03ff8e1114
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@digia.com>
---
 recipes/adbd/files/adb-init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/adbd/files/adb-init b/recipes/adbd/files/adb-init
index e88df23..6faed60 100755
--- a/recipes/adbd/files/adb-init
+++ b/recipes/adbd/files/adb-init
@@ -8,7 +8,7 @@ SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address)
 
 case "$1" in
 start)
-    insmod $(busybox find /lib/modules/$(uname -r) -name "g_ffs.ko") idVendor=${VENDOR} idProduct=${PRODUCT} iSerialNumber=${SERIAL}
+    modprobe g_ffs idVendor=${VENDOR} idProduct=${PRODUCT} iSerialNumber=${SERIAL}
     mkdir -p /dev/usb-ffs
     chmod 770 /dev/usb-ffs
     mkdir -p /dev/usb-ffs/adb
-- 
cgit v1.2.3-54-g00ecf