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, 9 insertions, 3 deletions

diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index b761ddd..2a64026 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -20,10 +20,16 @@
 ##
 #############################################################################
 
-IMAGE_CLASSES += "image_types_sdcard"
-IMAGE_FSTYPES = "tar.gz ext3 sdcard"
+IMAGE_FSTYPES = "tar.gz"
 
-BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
+BOOTFS_CONTENT = "\
+    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
+    6x_bootscript-${MACHINE}:6x_bootscript \
+    6x_upgrade-${MACHINE}:6x_upgrade \
+    "
+BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-boundary:do_deploy"
+
+EXTRA_IMAGEDEPENDS += "u-boot-script-boundary"
 
 MACHINE_EXTRA_INSTALL = "\
         libgal-mx6 \