[dcd] Initial MTP & usb-moded configfs setup

sailfishos-oneplus5 · Nov 1, 2019 · 6dfc152 · 6dfc152
1 parent d23a2fc
commit 6dfc152
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/patterns/jolla-hw-adaptation-cheeseburger.yaml b/patterns/jolla-hw-adaptation-cheeseburger.yaml
@@ -67,10 +67,6 @@ Requires:
 ## USB mode controller
 # Enables mode selector upon plugging USB cable:
 - usb-moded
-- usb-moded-defaults-android
-- usb-moded-developer-mode-android
-# Connection sharing via USB (careful with roaming!)
-- usb-moded-connection-sharing-android-config
 
 # hammerhead, grouper, and maguro use this in scripts, so include for all
 - rfkill

diff --git a/rpm/droid-config-cheeseburger.spec b/rpm/droid-config-cheeseburger.spec
@@ -9,6 +9,10 @@
 %define community_adaptation 1
 %define pixel_ratio 1.8
 
+# Device-specific usb-moded configuration
+Provides: usb-moded-configs
+Obsoletes: usb-moded-defaults
+
 # Device-specific ofono configuration
 Provides: ofono-configs
 Obsoletes: ofono-configs-mer

diff --git a/sparse/etc/systemd/system/dev-mtp.mount b/sparse/etc/systemd/system/dev-mtp.mount
diff --git a/sparse/etc/usb-moded/usb-moded-configfs.ini b/sparse/etc/usb-moded/usb-moded-configfs.ini
@@ -0,0 +1,3 @@
+[configfs]
+gadget_conf_directory = configs/c.1
+function_rndis        = rndis.usb0
diff --git a/sparse/etc/usb-moded/usb-moded.ini b/sparse/etc/usb-moded/usb-moded.ini
@@ -0,0 +1,2 @@
+[usbmode]
+mode=ask