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, 0 deletions

diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf
index ba13aaa..376e3c6 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/conf/distro/include/beaglebone.conf
@@ -17,6 +17,15 @@
 ############################################################################
 IMAGE_FSTYPES = "tar.gz"
 
+BOOTFS_CONTENT = "\
+    u-boot-${MACHINE}.img:u-boot.img \
+    MLO-${MACHINE}:MLO \
+    uEnv-${MACHINE}.txt:uEnv.txt \
+    "
+BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-uenv-script:do_deploy"
+
+EXTRA_IMAGEDEPENDS += "u-boot-uenv-script"
+
 PREFERRED_VERSION_libgles-omap3 = "5.01.00.01"
 PREFERRED_VERSION_omap3-sgx-modules = "5.01.00.01"