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

1 files changed, 51 insertions, 0 deletions

diff --git a/classes/bootfs-image.bbclass b/classes/bootfs-image.bbclass
new file mode 100644
index 0000000..5292965
--- /dev/null
+++ b/classes/bootfs-image.bbclass
@@ -0,0 +1,51 @@
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+BOOTFS_NAME = "${IMAGE_BASENAME}-boot-${MACHINE}-${DATETIME}"
+BOOTFS_LINK_NAME = "${IMAGE_BASENAME}-boot-${MACHINE}"
+
+BOOTFS_DEPENDS ?= ""
+
+fakeroot do_bootfs () {
+        if [ -n ${BOOTFS_CONTENT} ]; then
+                exit 0
+        fi
+
+        mkdir -p ${S}/bootfs
+
+        for item in ${BOOTFS_CONTENT}; do
+                src=`echo $item | awk -F':' '{ print $1 }'`
+                dst=`echo $item | awk -F':' '{ print $2 }'`
+
+                install -m 0755 ${DEPLOY_DIR_IMAGE}/$src ${S}/bootfs/$dst
+        done
+
+        cd ${S}/bootfs
+        rm -f ${DEPLOY_DIR_IMAGE}/${BOOTFS_NAME}.tar.gz ${DEPLOY_DIR_IMAGE}/${BOOTFS_LINK_NAME}.tar.gz
+
+        tar czvf ${DEPLOY_DIR_IMAGE}/${BOOTFS_NAME}.tar.gz .
+        ln -s ${BOOTFS_NAME}.tar.gz ${DEPLOY_DIR_IMAGE}/${BOOTFS_LINK_NAME}.tar.gz
+}
+
+addtask bootfs before do_rootfs
+
+do_bootfs[depends] += "${BOOTFS_DEPENDS}"