3 files changed, 44 insertions, 1 deletions

diff --git a/recipes/adbd/adbd.bb b/recipes/adbd/adbd.bb
index aa8f5e9..1feb7c3 100644
--- a/recipes/adbd/adbd.bb
+++ b/recipes/adbd/adbd.bb
@@ -1,3 +1,25 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
 DESCRIPTION = "Android Debug Bridge Daemon"
 HOMEPAGE = "http://developer.android.com/tools/help/adb.html"
 SECTION = "devel"
diff --git a/recipes/adbd/files/adb-init b/recipes/adbd/files/adb-init
index e88df23..6faed60 100755
--- a/recipes/adbd/files/adb-init
+++ b/recipes/adbd/files/adb-init
@@ -8,7 +8,7 @@ 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=${VENDOR} idProduct=${PRODUCT} iSerialNumber=${SERIAL}
+    modprobe g_ffs idVendor=${VENDOR} idProduct=${PRODUCT} iSerialNumber=${SERIAL}
     mkdir -p /dev/usb-ffs
     chmod 770 /dev/usb-ffs
     mkdir -p /dev/usb-ffs/adb
diff --git a/recipes/adbd/files/raspberrypi/adb-init b/recipes/adbd/files/raspberrypi/adb-init
new file mode 100644
index 0000000..8910e0e
--- /dev/null
+++ b/recipes/adbd/files/raspberrypi/adb-init
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+DAEMON=/usr/bin/adbd
+
+case "$1" in
+start)
+    start-stop-daemon --start --quiet --exec $DAEMON &
+    ;;
+stop)
+    start-stop-daemon --stop --quiet --exec $DAEMON
+    ;;
+restart)
+    start-stop-daemon --stop --quiet --exec $DAEMON
+    sleep 1
+    start-stop-daemon --start --quiet --exec $DAEMON &
+    ;;
+*)
+    echo "Usage: $0 {start|stop|restart}"
+    exit 1
+esac
+exit 0