Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge branch 'upstream_sync' into 'master'
Upstream sync [version] Merge changes from upstream 0.86.0 version. Fixes MER#1583 Cherry-pick commits from upstream repo that are missing from mer usb-moded. Due to version conflicts created earlier, the mer versions (that are higher than ones used by upstream) are retained in configure.ac and rpm/usb-moded.spec -files. See merge request !18
- Loading branch information
Showing
6 changed files
with
46 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
#!/bin/sh | ||
set -e | ||
mkdir -p /dev/usb-ffs | ||
chmod 0770 /dev/usb-ffs | ||
chown shell:shell /dev/usb-ffs | ||
mkdir -p /dev/usb-ffs/adb | ||
chmod 0770 /dev/usb-ffs/adb | ||
chown shell:shell /dev/usb-ffs/adb | ||
/bin/mount -t functionfs adb /dev/usb-ffs/adb -o uid=shell,gid=shell | ||
exit 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
# Copyright (C) 2013 Jolla Oy | ||
# | ||
# Prepare functionfs for adbd | ||
|
||
[Unit] | ||
Description=functionfs setup for adbd | ||
Before=adbd.service | ||
PartOf=adbd.service | ||
|
||
[Service] | ||
Type=notify | ||
RemainAfterExit=yes | ||
ExecStart=/usr/sbin/adbd-functionfs.sh | ||
ExecStop=/bin/umount adb | ||
|
||
[Install] | ||
WantedBy=graphical.target |