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, 5 insertions, 1 deletions

diff --git a/recipes/adbd/adbd.bb b/recipes/adbd/adbd.bb
index 1feb7c3..9e3ed67 100644
--- a/recipes/adbd/adbd.bb
+++ b/recipes/adbd/adbd.bb
@@ -36,6 +36,7 @@ SRC_URI = "git://android.googlesource.com/platform/system/core;protocol=https \
            file://adbd.patch;striplevel=2 \
            file://Makefile.adbd \
            file://adb-init \
+           file://defaults \
           "
 
 S = "${WORKDIR}/git/adb"
@@ -44,7 +45,7 @@ FILES_${PN} += "${bindir}/adbd"
 
 do_configure() {
         if [ -n "${ADB_PRODUCTID}" ]; then
-                sed -i -e 's/PRODUCT=.*/PRODUCT=${ADB_PRODUCTID}/' ${WORKDIR}/adb-init
+                sed -i -e 's/PRODUCT=.*/PRODUCT=${ADB_PRODUCTID}/' ${WORKDIR}/defaults
         fi
 }
 
@@ -58,6 +59,9 @@ do_install() {
 
         install -m 0755 -d ${D}${sysconfdir}/init.d
         install -m 0755 ${WORKDIR}/adb-init ${D}${sysconfdir}/init.d/
+
+        install -m 0755 -d ${D}${sysconfdir}/default
+        install -m 0755 ${WORKDIR}/defaults ${D}${sysconfdir}/default/adbd
 }
 
 INITSCRIPT_NAME = "adb-init"