Merge branch 'stable' into releaseQtEE_v2.1.0

* stable:
  wpa-supplicant: include headers and sources for external usage
  bootfs: need to use fakeroot for tar'ing
  sdk: include bluez4-dev package to sdk
  Create boot.tar.gz as part of the image build
  image: include CA certificates to image
  adbd: use network connection in imx53qsb
  sdk: libcap is required for QtWebEngine
  Include licenses to the image
  adbd: make switching between usb and ethernet easier
  use package groups for image content
  Create only tar.gz image type
  Change from dylan to dora brach in README
  mkcard: remove recipe for mkcard

Change-Id: Id56ca219d05f2f833a4de3fc3ca057c5cf50a562

2 files changed, 0 insertions, 98 deletions

diff --git a/recipes/mkcard/files/mkcard.sh b/recipes/mkcard/files/mkcard.sh
deleted file mode 100755
index e75a176..0000000
--- a/recipes/mkcard/files/mkcard.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/sh
-# mkcard.sh v0.5
-# (c) Copyright 2009 Graeme Gregory <dp@xora.org.uk>
-# Licensed under terms of GPLv2
-#
-# Parts of the procudure base on the work of Denys Dmytriyenko
-# http://wiki.omap.com/index.php/MMC_Boot_Format
-
-export LC_ALL=C
-
-if [ $# -ne 1 ]; then
-        echo "Usage: $0 <drive>"
-        exit 1;
-fi
-
-DRIVE=$1
-
-dd if=/dev/zero of=$DRIVE bs=1024 count=1024
-
-SIZE=`fdisk -l $DRIVE | grep Disk | grep bytes | awk '{print $5}'`
-
-echo DISK SIZE - $SIZE bytes
-
-CYLINDERS=`echo $SIZE/255/63/512 | bc`
-
-echo CYLINDERS - $CYLINDERS
-
-{
-echo ,9,0x0C,*
-echo ,,,-
-} | sfdisk -D -H 255 -S 63 -C $CYLINDERS $DRIVE
-
-sleep 1
-
-# 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
-
-PARTITION1=${DRIVE}1
-if [ ! -b ${PARTITION1} ]; then
-        PARTITION1=${DRIVE}p1
-fi
-
-PARTITION2=${DRIVE}2
-if [ ! -b ${PARTITION2} ]; then
-        PARTITION2=${DRIVE}p2
-fi
-
-# now make partitions.
-if [ -b ${PARTITION1} ]; then
-        umount ${PARTITION1}
-        mkfs.vfat -F 32 -n "boot" ${PARTITION1}
-else
-        echo "Cant find boot partition in /dev"
-fi
-
-if [ -b ${PARITION2} ]; then
-        umount ${PARTITION2}
-        mke2fs -t ext3 -j -L "rootfs" ${PARTITION2}
-else
-        echo "Cant find rootfs partition in /dev"
-fi
diff --git a/recipes/mkcard/mkcard_0.5.bb b/recipes/mkcard/mkcard_0.5.bb
deleted file mode 100644
index 8d71f81..0000000
--- a/recipes/mkcard/mkcard_0.5.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-#############################################################################
-##
-## 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"
-SECTION = "devel"
-PR = "0"
-
-SRC_URI = "file://mkcard.sh"
-
-do_install () {
-    install -d ${D}${bindir}/
-    install -m 0755 ${WORKDIR}/mkcard.sh ${D}${bindir}/
-}
-
-BBCLASSEXTEND = "nativesdk"