From 318b95d57d13962053feeb9a870447e473a58f7a Mon Sep 17 00:00:00 2001 From: Devendra Tewari Date: Sat, 20 Aug 2022 08:01:31 -0300 Subject: [PATCH] Revert "Suppress eol in functionfs setup scripts (#147)" This reverts commit db5f48734404a52ee5323659082f1d6baa225ca7. Signed-off-by: Devendra Tewari --- .../android-tools-conf-configfs/android-gadget-cleanup | 2 +- .../android-tools-conf-configfs/android-gadget-setup | 4 ++-- .../android-tools-conf-configfs/android-gadget-start | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-cleanup b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-cleanup index f27d77df512..517227d4a63 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-cleanup +++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-cleanup @@ -6,7 +6,7 @@ cd /sys/kernel/config/usb_gadget cd adb -echo -n "" > UDC || true +echo "" > UDC || true killall adbd || true diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup index dbd71151510..e44d1bacbe3 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup +++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-setup @@ -23,8 +23,8 @@ mkdir configs/c.1 mkdir functions/ffs.usb0 mkdir strings/0x409 mkdir configs/c.1/strings/0x409 -echo -n 0x18d1 > idVendor -echo -n 0xd002 > idProduct +echo 0x18d1 > idVendor +echo 0xd002 > idProduct echo "$serial" > strings/0x409/serialnumber echo "$manufacturer" > strings/0x409/manufacturer echo "$model" > strings/0x409/product diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-start b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-start index d67878fef9a..ca6c3df2753 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-start +++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf-configfs/android-gadget-start @@ -4,4 +4,4 @@ set -e sleep 3 -ls /sys/class/udc/ | xargs echo -n > /sys/kernel/config/usb_gadget/adb/UDC +ls /sys/class/udc/ > /sys/kernel/config/usb_gadget/adb/UDC