diff options
author | Devendra Tewari <devendra.tewari@gmail.com> | 2021-07-26 16:31:20 -0300 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-07-29 10:35:38 -0700 |
commit | db5f48734404a52ee5323659082f1d6baa225ca7 (patch) | |
tree | b8c35f5b66171202eb68e16581fd14d9c88068b2 /meta-oe | |
parent | 5e042ac2079bffa3ae3d9839a50bf6a3d3f1930a (diff) | |
download | meta-openembedded-db5f48734404a52ee5323659082f1d6baa225ca7.tar.gz |
Suppress eol in functionfs setup scripts (#147)
Stray newline character causes errors in functionfs setup scripts
used by android-tools-adbd.service, when using musl libc and/or toybox.
Signed-off-by: Devendra Tewari <devendra.tewari@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
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 517227d4a..f27d77df5 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 | |||
6 | 6 | ||
7 | cd adb | 7 | cd adb |
8 | 8 | ||
9 | echo "" > UDC || true | 9 | echo -n "" > UDC || true |
10 | 10 | ||
11 | killall adbd || true | 11 | killall adbd || true |
12 | 12 | ||
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 e44d1bacb..dbd711515 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 | |||
23 | mkdir functions/ffs.usb0 | 23 | mkdir functions/ffs.usb0 |
24 | mkdir strings/0x409 | 24 | mkdir strings/0x409 |
25 | mkdir configs/c.1/strings/0x409 | 25 | mkdir configs/c.1/strings/0x409 |
26 | echo 0x18d1 > idVendor | 26 | echo -n 0x18d1 > idVendor |
27 | echo 0xd002 > idProduct | 27 | echo -n 0xd002 > idProduct |
28 | echo "$serial" > strings/0x409/serialnumber | 28 | echo "$serial" > strings/0x409/serialnumber |
29 | echo "$manufacturer" > strings/0x409/manufacturer | 29 | echo "$manufacturer" > strings/0x409/manufacturer |
30 | echo "$model" > strings/0x409/product | 30 | 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 ca6c3df27..d67878fef 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 | |||
4 | 4 | ||
5 | sleep 3 | 5 | sleep 3 |
6 | 6 | ||
7 | ls /sys/class/udc/ > /sys/kernel/config/usb_gadget/adb/UDC | 7 | ls /sys/class/udc/ | xargs echo -n > /sys/kernel/config/usb_gadget/adb/UDC |