Update on adbd recipes

-using hostname + mac address for serialnumber
-using start-stop-daemon for adbd
-using RRECOMMENDS to include g-ffs module
-android sources are Apache licensed

Change-Id: Iaec92b93cf22702586d39fa7923b8735f650ea57
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>

1 files changed, 17 insertions, 5 deletions

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