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

1 files changed, 0 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