[dcd] Start resolving usb-moded & configfs issues

JamiKettunen · JamiKettunen · commit 333533b5daec · 2019-10-08T20:53:12.000+03:00
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
@@ -92,4 +88,4 @@ Requires:
 - nano
 - htop
 
-Summary: Jolla HW Adaptation cheeseburger
+Summary: Jolla HW Adaptation cheeseburger
diff --git a/rpm/droid-config-cheeseburger.spec b/rpm/droid-config-cheeseburger.spec
@@ -16,4 +16,8 @@ Obsoletes: ofono-configs-mer
 %define ofono_enable_plugins bluez5,hfp_ag_bluez5
 %define ofono_disable_plugins bluez4,dun_gw_bluez4,hfp_ag_bluez4,hfp_bluez4
 
-%include droid-configs-device/droid-configs.inc
+# Device-specific usb-moded configuration
+Provides: usb-moded-configs
+Obsoletes: usb-moded-defaults
+
+%include droid-configs-device/droid-configs.inc
diff --git a/sparse/etc/usb-moded/usb-moded-configfs.ini b/sparse/etc/usb-moded/usb-moded-configfs.ini
@@ -0,0 +1,2 @@
+[configfs]
+gadget_conf_directory = configs/c.1

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[configfs]`
	`2`	`+gadget_conf_directory = configs/c.1`