3 files changed, 38 insertions, 15 deletions

diff --git a/recipes/adbd/adbd.bb b/recipes/adbd/adbd.bb
index 1cc8882..3d3e9d6 100644
--- a/recipes/adbd/adbd.bb
+++ b/recipes/adbd/adbd.bb
@@ -1,24 +1,36 @@
 DESCRIPTION = "Android Debug Bridge Daemon"
 HOMEPAGE = "http://developer.android.com/tools/help/adb.html"
-SECTION = "libs"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://ThirdPartyProject.prop;md5=4e5987c5919a36739dc8f76a4e35d9eb"
+SECTION = "devel"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://NOTICE;md5=2ddb23e63b1f9c3c46aaa4195f819a6d"
 
+PV = "android-4.2.2_r1.2"
 PR = "r0"
-SRCREV = "android-4.2.2_r1.2"
+SRCREV = "${PV}"
 
-SRC_URI = "git://android.googlesource.com/platform/system/core;protocol=https;tag=${SRCREV} \
-           file://adbd.patch \
+RRECOMMENDS_${PN} += "kernel-module-g-ffs"
+
+SRC_URI = "git://android.googlesource.com/platform/system/core;protocol=https \
+           file://adbd.patch;striplevel=2 \
            file://Makefile.adbd \
            file://adb-init \
           "
 
-S = "${WORKDIR}/git"
+S = "${WORKDIR}/git/adb"
 
 FILES_${PN} += "${bindir}/adbd"
 
+PRODUCTID_beagleboard = "0x9018"
+PRODUCTID_mx6 = "0x0d02"
+
+do_configure() {
+        if [ -n "${PRODUCTID}" ]; then
+                sed -i -e 's/PRODUCT=.*/PRODUCT=${PRODUCTID}/' ${WORKDIR}/adb-init
+        fi
+}
+
 do_compile() {
-        make -C adb -f ${WORKDIR}/Makefile.adbd
+        make -f ${WORKDIR}/Makefile.adbd
 }
 
 do_install() {
diff --git a/recipes/adbd/files/adb-init b/recipes/adbd/files/adb-init
index 6f2910e..e88df23 100755
--- a/recipes/adbd/files/adb-init
+++ b/recipes/adbd/files/adb-init
@@ -1,22 +1,34 @@
 #!/bin/sh
+
+DAEMON=/usr/bin/adbd
+
+VENDOR=0x18d1
+PRODUCT=0x0000
+SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address)
+
 case "$1" in
 start)
-    insmod $(busybox find /lib/modules/$(uname -r) -name "g_ffs.ko") idVendor=0x18d1 idProduct=0x4e26 iSerialNumber=$(hostname)
+    insmod $(busybox find /lib/modules/$(uname -r) -name "g_ffs.ko") idVendor=${VENDOR} idProduct=${PRODUCT} iSerialNumber=${SERIAL}
     mkdir -p /dev/usb-ffs
     chmod 770 /dev/usb-ffs
     mkdir -p /dev/usb-ffs/adb
     chmod 770 /dev/usb-ffs/adb
     mount -t functionfs adb /dev/usb-ffs/adb -o uid=0,gid=0
-
-    /usr/bin/adbd &
+    start-stop-daemon --start --quiet --exec $DAEMON &
     ;;
 stop)
-    killall adbd
+    start-stop-daemon --stop --quiet --exec $DAEMON
+    sleep 1
     umount /dev/usb-ffs/adb
     rmmod g_ffs
     ;;
+restart)
+    start-stop-daemon --stop --quiet --exec $DAEMON
+    sleep 1
+    start-stop-daemon --start --quiet --exec $DAEMON &
+    ;;
 *)
-    echo "Usage: $0 {start|stop}"
+    echo "Usage: $0 {start|stop|restart}"
     exit 1
 esac
 exit 0
diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb
index dbcd8f8..3ea50c7 100644
--- a/recipes/images/b2qt-embedded-image.bb
+++ b/recipes/images/b2qt-embedded-image.bb
@@ -45,6 +45,7 @@ GSTREAMER_EXTRA_INSTALL = "\
         "
 
 TOOLS_EXTRA_INSTALL = "\
+        adbd \
         ldd \
         "
 
@@ -60,8 +61,6 @@ IMAGE_INSTALL += "\
         freetype \
         fontconfig \
         liberation-fonts \
-        adbd \
-        kernel-module-g-ffs \
         ${GSTREAMER_EXTRA_INSTALL} \
         ${TOOLS_EXTRA_INSTALL} \
         ${MACHINE_EXTRA_INSTALL} \