android-gadget-setup: fix functionfs test

Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com>
webOS-ports · Jun 30, 2018 · c314b69 · c314b69
1 parent ae34ca8
commit c314b69
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/...eos/recipes-android/android-tools/android-tools-conf/0001_Enable_FunctionFS.install_patch b/...eos/recipes-android/android-tools/android-tools-conf/0001_Enable_FunctionFS.install_patch
@@ -5,7 +5,7 @@
  # serial=$(getprop ro.serialno 0123456789ABCDEF)
 
 +#below are now needed in order to use FunctionFS for ADB, tested to work with 3.4+ kernels
-+if [ grep -q functionfs /proc/filesystems ]; then
++if grep -q functionfs /proc/filesystems; then
 +    mkdir -p /dev/usb-ffs/adb 
 +    mount -t functionfs adb /dev/usb-ffs/adb
 +    #android-gadget-setup doesn't provide below 2 and without them it won't work, so we provide them here.

diff --git a/meta-luneos/recipes-android/android-tools/android-tools/android-tools-adbd.service b/meta-luneos/recipes-android/android-tools/android-tools/android-tools-adbd.service
@@ -8,7 +8,6 @@ Type=simple
 Restart=on-failure
 ExecStartPre=-/usr/bin/android-gadget-setup adb
 ExecStart=/usr/bin/adbd
-StandardOutput=null
 
 [Install]
 WantedBy=basic.target