Merge branch 'stable' into releaseQtEE_v2.0.0

* stable: (34 commits)
  udev: disable udev-cache also for beagleboard
  busybox: use ifplugd to enable hotplug networking
  Move libgl workaround to libsdl
  imx53: change to correct GPU driver package
  emulator: don't build mesa with llvm anymore
  Fix emulator hdd image building
  emulator: alsa config to allow multiple source to play audio
  hunspell: use multple checksums for hunspell srcs
  Changes to init script
  Add script to initialize yocto build env
  Add missing copyright headers
  Update copyright year to 2014
  adb: use modprobe to load dependency modules
  udev: disable udev-cache on beaglebone
  Add support for BeagleBone Black
  Recipe for hunspell
  upgrade emulator components
  gpu-viv-bin-mx6q: remove dependency to mesa
  rpi: disable bbappend from meta-raspberrypi
  Install all kernel modules
  ...

Change-Id: I7adca9894ee35092d546babb1926edbf06300feb

2 files changed, 22 insertions, 16 deletions

diff --git a/recipes/mkcard/files/mkcard.sh b/recipes/mkcard/files/mkcard.sh
index 3e70dbc..e75a176 100755
--- a/recipes/mkcard/files/mkcard.sh
+++ b/recipes/mkcard/files/mkcard.sh
@@ -32,11 +32,6 @@ echo ,,,-
 
 sleep 1
 
-
-if [ -x `which kpartx` ]; then
-        kpartx -a ${DRIVE}
-fi
-
 # handle various device names.
 # note something like fdisk -l /dev/loop0 | egrep -E '^/dev' | cut -d' ' -f1
 # won't work due to https://bugzilla.redhat.com/show_bug.cgi?id=649572
@@ -46,21 +41,10 @@ if [ ! -b ${PARTITION1} ]; then
         PARTITION1=${DRIVE}p1
 fi
 
-DRIVE_NAME=`basename $DRIVE`
-DEV_DIR=`dirname $DRIVE`
-
-if [ ! -b ${PARTITION1} ]; then
-        PARTITION1=$DEV_DIR/mapper/${DRIVE_NAME}p1
-fi
-
 PARTITION2=${DRIVE}2
 if [ ! -b ${PARTITION2} ]; then
         PARTITION2=${DRIVE}p2
 fi
-if [ ! -b ${PARTITION2} ]; then
-        PARTITION2=$DEV_DIR/mapper/${DRIVE_NAME}p2
-fi
-
 
 # now make partitions.
 if [ -b ${PARTITION1} ]; then
diff --git a/recipes/mkcard/mkcard_0.5.bb b/recipes/mkcard/mkcard_0.5.bb
index 3671f7a..8d71f81 100644
--- a/recipes/mkcard/mkcard_0.5.bb
+++ b/recipes/mkcard/mkcard_0.5.bb
@@ -1,3 +1,25 @@
+#############################################################################
+##
+## Copyright (C) 2014 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 = "mkcard.sh v0.5"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://${COREBASE}/bitbake/COPYING;md5=751419260aa954499f7abaabaa882bbe"