adb: make sure serial number is max 32 characters

Windows adb cannot handle devices which have longer serial, so limit
it to 32 characters. Remove the -linux- part of the hostname to make
it a bit shorter.

Change-Id: I3f6f811a9ecd8a273576fdef268d5a343edc531e
Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>

2 files changed, 2 insertions, 2 deletions

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 991cefc..b14b55d 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -74,7 +74,7 @@ PARALLEL_MAKE ?= "-j ${@oe.utils.cpu_count()}"
 #
 # This sets the default machine to be qemux86 if no other machine is selected:
 MACHINE ??= "qemux86"
-MACHINE_HOSTNAME ?= "b2qt-linux-${MACHINE}"
+MACHINE_HOSTNAME ?= "b2qt-${MACHINE}"
 
 #
 # Where to place downloads
diff --git a/recipes/adbd/files/adb-init b/recipes/adbd/files/adb-init
index d8920b8..5f47fd0 100755
--- a/recipes/adbd/files/adb-init
+++ b/recipes/adbd/files/adb-init
@@ -11,7 +11,7 @@ fi
 case "$1" in
 start)
     if [ "$USE_ETHERNET" = "no" ]; then
-        modprobe g_ffs idVendor=${VENDOR} idProduct=${PRODUCT} iSerialNumber=${SERIAL}
+        modprobe g_ffs idVendor=${VENDOR} idProduct=${PRODUCT} iSerialNumber=${SERIAL:0:32}
         mkdir -p /dev/usb-ffs
         chmod 770 /dev/usb-ffs
         mkdir -p /dev/usb-ffs/adb