temp/ofono: assume mainline gobi network interface is "rmnet0" (MR 1607)

This allows to connect the modem to the Internet with oFono.
I have verified that this does not break anything if the "rmnet0"
network interface is missing. Plus, all mainline devices currently
covered by the package should also be able to use the new "BAM DMUX"
network driver that is used as network interface to the modem.

(Note: This works differently on newer SoCs, but they also need
       something different in oFono...)

temp/ofono/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=ofono
 pkgver=9999
 _pkgver=1.31
-pkgrel=6
+pkgrel=7
 pkgdesc="Infrastructure for building mobile telephony (GSM/UMTS) applications [$_pkgver]"
 url="https://01.org/ofono"
 arch="armhf armv7 aarch64"
@@ -76,7 +76,7 @@ sha512sums="377cda34dcc92d1f339a4b3271de5a14afaf309061c4467e5af18089cd821e65c0d8
 7367464a8983969c9a78c1e4f8759a17eb47f6c61c94b088d749c83bb7ef5d19e037cadedd7ef5d34a0fdfe837fa8059e963f4fb2b14148e4a80f00e7cb29286  fix-explicit-bzero.patch
 687a2fd592add40122b789073ab9970d6e966752fdecc4077afe1c1bba705fe541dd0e457094f1d9cde747c571b7810b5b1a30835a3f1869bcd810751d5bf76f  fix-TEMP_FAILURE_RETRY.patch
 777ab2e13eebd1ccbe12a304310a83b262a5d934207c6a8d410e75aff380838eed1a52f3c2fe0d80c1e7db7faa9b55bf17e78a1e1acd8cfb95a3c6aef49c5b67  skip-broken-test.patch
-32e02e64cde806823b27c18380b88656a0fa95aefc35052256e368f13979d093fae5d7bbd6d1bb9ba8294912caea6e017715550872cabd85203a831658be4210  support-smdpkt.patch
+f7f398f77877e78087b691f78ee0f3af5f99d0f15d01d107fbefff16118db4c1e0261c032bd97836a6c30d8b8a4be9d755900c5f9ea48d274a53d9c39c92683b  support-smdpkt.patch
 ad25dcc34bf710287c9a03fdcd61f2f2fd675691f55be30dbe7c8421753aa857906dd23b2d4f7f752fbc62caf2857b00bf5eaa8916e62718d1da7d0abc083ca0  0001-common-create-GList-helper-ofono_call_compare.patch
 7e2f7fb1e661cc9f2180c55c701823050328ee906171148e4ba200e6365f1c40382dab608e78e383e62c9029a6a41d7d7a18b971132df30839f625eb576cb080  0002-common-atmodem-move-at_util_call_compare_by_status-t.patch
 1a55f558c2e3058eee7dae2a60538417ae0fc058f322f4740a0f46a080cc2fda2c8a8cd522d243ab8f0be2ea461ad7dc1c27d2e73bcaac5848d9c592d6386d8a  0003-common-atmodem-move-at_util_call_compare_by_id-to-dr.patch
@@ -85,5 +85,5 @@ ad25dcc34bf710287c9a03fdcd61f2f2fd675691f55be30dbe7c8421753aa857906dd23b2d4f7f75
 6dd4d5f829d66b5b9a13aed6d5a991a2cd3dee6db04a122bcc1d87d0eddc37637468bec58f9fe6027c89eac3b14411201d324150e6be4b103622340da6a599fe  0006-qmimodem-Fix-dialing-to-an-international-number.patch
 bc76c404a7de626210dbd78f659444567a95b6e6d8db0661d5d67ea361e2941ad55242d43a5957995817145d4d5323476fbc42d1830b20608a5e90a7a4ba1194  ofono.initd
 54a2cb55547e77c22a98c4260f2e94d9327d5d98e1b604f9413a7380ae4489247a97561cc2ab39476bc6e6fb5e673dca8053218b18ac4626addb51ecb29f0167  ofono-auto-enable.initd
-8f2893dfc291fc210ef217c4bc74d79436a0997001dd2773809625d52dd19d092cc75d3f9aa5ed2f3d4a6248d4a4e17013a7655323f7dad951f744c55b572417  udev.rules
+28ba914e171ba7f0dcc4be24f2bd078a8db6b2c0fdbb29845b2702f00f9cf64d0e9ecb277e5d7f8113ef450eb9044e542e7093129ecd67bef1c9e9328756391c  udev.rules
 72cd0cd4bee1f885a990c84f7ed3ef27e0d9d2db37d9a486342204152cb02a67d5197e8014dfea59f1a95285c674695b3dc3cb2b53941781bcfc9b73d5580b1f  ofono-wheel.conf"

temp/ofono/support-smdpkt.patch

@@ -1,17 +1,17 @@
-From c11cbed28cbd7b927153069245e791dcb78a1e71 Mon Sep 17 00:00:00 2001
+From 71737365a6af9f736a816efa7ec15783ab82de6b Mon Sep 17 00:00:00 2001
 From: Joey Hewitt <joey@joeyhewitt.com>
 Date: Fri, 19 Jul 2019 22:02:07 +0200
 Subject: [PATCH] support smdpkt
 
 ---
- plugins/udevng.c | 64 ++++++++++++++++++++++++++----------------------
- 1 file changed, 35 insertions(+), 29 deletions(-)
+ plugins/udevng.c | 65 +++++++++++++++++++++++++++---------------------
+ 1 file changed, 36 insertions(+), 29 deletions(-)
 
 diff --git a/plugins/udevng.c b/plugins/udevng.c
-index f689b756..c07cae79 100644
+index 4a38621b..ba7d72f0 100644
 --- a/plugins/udevng.c
 +++ b/plugins/udevng.c
-@@ -202,41 +202,45 @@ static gboolean setup_gobi(struct modem_info *modem)
+@@ -203,41 +203,46 @@ static gboolean setup_gobi(struct modem_info *modem)
  
  	DBG("%s", modem->syspath);
  
@@ -82,11 +82,12 @@ index f689b756..c07cae79 100644
 +			return FALSE;
 +	} else {
 +		qmi = modem->serial->devnode;
++		net = udev_device_get_property_value(modem->serial->dev, "OFONO_NETWORK_INTERFACE");
 +	}
  
  
  	ofono_modem_set_string(modem->modem, "Device", qmi);
-@@ -1867,6 +1871,8 @@ static void enumerate_devices(struct udev *context)
+@@ -2024,6 +2029,8 @@ static void enumerate_devices(struct udev *context)
  		return;
  
  	udev_enumerate_add_match_subsystem(enumerate, "tty");
@@ -96,5 +97,5 @@ index f689b756..c07cae79 100644
  	udev_enumerate_add_match_subsystem(enumerate, "usbmisc");
  	udev_enumerate_add_match_subsystem(enumerate, "net");
 -- 
-2.22.0
+2.27.0
 

temp/ofono/udev.rules

@@ -1,2 +1,2 @@
 SYMLINK=="modem", SUBSYSTEM=="smdpkt",   ENV{OFONO_DRIVER}="gobi"
-SYMLINK=="modem", SUBSYSTEM=="rpmsg",    ENV{OFONO_DRIVER}="gobi"
+SYMLINK=="modem", SUBSYSTEM=="rpmsg",    ENV{OFONO_DRIVER}="gobi", ENV{OFONO_NETWORK_INTERFACE}="rmnet0"