Merge lp:~mariusko/modemmanager/ubuntu.quantal_lp1057186 into lp:~modemmanager/modemmanager/ubuntu.quantal

Proposed by Marius B. Kotsbak on 2012-10-24
Status: Rejected
Rejected by: Mathieu Trudel-Lapierre on 2015-09-24
Proposed branch: lp:~mariusko/modemmanager/ubuntu.quantal_lp1057186
Merge into: lp:~modemmanager/modemmanager/ubuntu.quantal
Diff against target: 124 lines (+98/-0)
4 files modified
debian/changelog (+15/-0)
debian/patches/0001-huawei-better-detection-of-data-port-on-some-modems.patch (+51/-0)
debian/patches/git_via-plugin-has-vendor-product-string-probing-so-need_69fe9a8.patch (+31/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~mariusko/modemmanager/ubuntu.quantal_lp1057186
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre 2012-10-24 Disapprove on 2015-09-24
Review via email: mp+131224@code.launchpad.net
To post a comment you must log in.
Mathieu Trudel-Lapierre (cyphermox) wrote :

There's an extra file in teh changes:
 === added file 'debian/patches/git_via-plugin-has-vendor-product-string-probing-so-need_69fe9a8.patch'

Is this expected? If so, to be applied it should be added debian/patches/series, and definitely mentioned in debian/changelog.

Additionally, please target this to the /ubuntu branch instead of /ubuntu.quantal, SRU normally requires updates to be tested in the development release before being provided in proposed for releases.

review: Needs Fixing
Marius B. Kotsbak (mariusko) wrote :

> There's an extra file in teh changes:
> === added file 'debian/patches/git_via-plugin-has-vendor-product-string-
> probing-so-need_69fe9a8.patch'
>
> Is this expected? If so, to be applied it should be added
> debian/patches/series, and definitely mentioned in debian/changelog.

Well, I hoped it disappeared, but I probably didn't handle bzr correctly.

> Additionally, please target this to the /ubuntu branch instead of
> /ubuntu.quantal, SRU normally requires updates to be tested in the development
> release before being provided in proposed for releases.

It is a bit complicated, since there, the patch I mentioned above is probably needed, but if we there sync the latest 0.6 branch, that one is included and we just need the patch in this commit.

Anyway, the fix is not even upstream yet, we are awaiting for the reporter to test the fix first.

165. By Marius B. Kotsbak on 2012-11-08

Replace patch git_huawei-better-detection-of-data-port-on-some-modems_18c3dfa.patch with two new from upstream:
huawei-better-detection-of-data-port-on-some-modems.patch and via-plugin-has-vendor-product-string-probing-so-need

166. By Marius B. Kotsbak on 2012-11-08

Fix Debian version number.

167. By Marius B. Kotsbak on 2012-11-08

Formating error in changelog file.

168. By Marius B. Kotsbak on 2012-11-08

Remove patch 0001-via-plugin-has-vendor-product-string-probing-so-need.patch as it applies to newer versions than
is currently in Quantal.

Mathieu Trudel-Lapierre (cyphermox) wrote :

This would certainly no longer apply to any currently supported release of Ubuntu; closing as "Rejected". Futhermore, it looks like the bug is Fix Released.

review: Disapprove

Unmerged revisions

168. By Marius B. Kotsbak on 2012-11-08

Remove patch 0001-via-plugin-has-vendor-product-string-probing-so-need.patch as it applies to newer versions than
is currently in Quantal.

167. By Marius B. Kotsbak on 2012-11-08

Formating error in changelog file.

166. By Marius B. Kotsbak on 2012-11-08

Fix Debian version number.

165. By Marius B. Kotsbak on 2012-11-08

Replace patch git_huawei-better-detection-of-data-port-on-some-modems_18c3dfa.patch with two new from upstream:
huawei-better-detection-of-data-port-on-some-modems.patch and via-plugin-has-vendor-product-string-probing-so-need

164. By Marius B. Kotsbak on 2012-10-24

git_huawei-better-detection-of-data-port-on-some-modems_18c3dfa.patch:
fix for regression since Precise for Huawei E173 (LP: #1057186)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2012-09-28 00:46:34 +0000
+++ debian/changelog 2012-11-08 16:29:20 +0000
@@ -1,3 +1,18 @@
1
2modemmanager (0.6.0.0.really-0ubuntu2~fix.lp1057186ubuntu1) quantal; urgency=low
3
4 * Replace patch git_huawei-better-detection-of-data-port-on-some-modems_18c3dfa.patch with new patch:
5 huawei-better-detection-of-data-port-on-some-modems.patch
6
7 -- Marius Kotsbak <marius@marius-T1005> Thu, 08 Nov 2012 16:49:30 +0100
8
9modemmanager (0.6.0.0.really-0ubuntu2~fix-lp1057186) quantal; urgency=low
10
11 * git_huawei-better-detection-of-data-port-on-some-modems_18c3dfa.patch:
12 fix for regression since Precise for Huawei E173 (LP: #1057186)
13
14 -- Marius Kotsbak <marius@kotsbak.com> Wed, 24 Oct 2012 16:08:32 +0200
15
1modemmanager (0.6.0.0-0ubuntu3) quantal; urgency=low16modemmanager (0.6.0.0-0ubuntu3) quantal; urgency=low
217
3 * debian/patches/git_lte_4g_parsing_90489ae.patch,18 * debian/patches/git_lte_4g_parsing_90489ae.patch,
419
=== added file 'debian/patches/0001-huawei-better-detection-of-data-port-on-some-modems.patch'
--- debian/patches/0001-huawei-better-detection-of-data-port-on-some-modems.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/0001-huawei-better-detection-of-data-port-on-some-modems.patch 2012-11-08 16:29:20 +0000
@@ -0,0 +1,51 @@
1From 82356aa6ea841d739e06e1cd97734702e8fc98f1 Mon Sep 17 00:00:00 2001
2From: Aleksander Morgado <aleksander@lanedo.com>
3Date: Thu, 8 Nov 2012 15:59:12 +0100
4Subject: [PATCH] huawei: better detection of data port on some modems
5
6Some devices (e173) appear to lie about NDIS support; GETPORTMODE reports NDIS
7is enabled, but that port is actually the MDM port and responds to AT commands.
8So, if we get a port reported as NDIS and none reported as MDM, use the one
9reported as NDIS for PPP.
10
11https://bugs.launchpad.net/ubuntu/+source/modemmanager/+bug/1057186
12---
13 plugins/mm-plugin-huawei.c | 8 +++++++-
14 1 file changed, 7 insertions(+), 1 deletion(-)
15
16diff --git a/plugins/mm-plugin-huawei.c b/plugins/mm-plugin-huawei.c
17index fc1a23f..534d1a3 100644
18--- a/plugins/mm-plugin-huawei.c
19+++ b/plugins/mm-plugin-huawei.c
20@@ -49,6 +49,7 @@ mm_plugin_create (void)
21
22 #define TAG_HUAWEI_PCUI_PORT "huawei-pcui-port"
23 #define TAG_HUAWEI_MODEM_PORT "huawei-modem-port"
24+#define TAG_HUAWEI_NDIS_PORT "huawei-ndis-port"
25 #define TAG_HUAWEI_DIAG_PORT "huawei-diag-port"
26 #define TAG_GETPORTMODE_SUPPORTED "getportmode-supported"
27
28@@ -114,7 +115,8 @@ getportmode_response_cb (MMPluginBaseSupportsTask *task,
29 MMPlugin *plugin = mm_plugin_base_supports_task_get_plugin (task);
30
31 cache_port_mode (plugin, response->str, "PCUI:", TAG_HUAWEI_PCUI_PORT);
32- cache_port_mode (plugin, response->str, "MDM:", TAG_HUAWEI_MODEM_PORT);
33+ cache_port_mode (plugin, response->str, "MDM:", TAG_HUAWEI_MODEM_PORT);
34+ cache_port_mode (plugin, response->str, "NDIS:", TAG_HUAWEI_NDIS_PORT);
35 cache_port_mode (plugin, response->str, "DIAG:", TAG_HUAWEI_DIAG_PORT);
36
37 g_object_set_data (G_OBJECT (plugin), TAG_GETPORTMODE_SUPPORTED, GUINT_TO_POINTER (1));
38@@ -294,6 +296,10 @@ grab_port (MMPluginBase *base,
39 pflags = MM_AT_PORT_FLAG_PRIMARY;
40 else if (usbif + 1 == GPOINTER_TO_INT (g_object_get_data (G_OBJECT (base), TAG_HUAWEI_MODEM_PORT)))
41 pflags = MM_AT_PORT_FLAG_PPP;
42+ else if (!g_object_get_data (G_OBJECT (base), TAG_HUAWEI_MODEM_PORT) &&
43+ usbif + 1 == GPOINTER_TO_INT (g_object_get_data (G_OBJECT (base), TAG_HUAWEI_NDIS_PORT)))
44+ /* If NDIS reported only instead of MDM, use it */
45+ pflags = MM_AT_PORT_FLAG_PPP;
46 else if (!g_object_get_data (G_OBJECT (base), TAG_GETPORTMODE_SUPPORTED)) {
47 /* If GETPORTMODE is not supported, we assume usbif 0 is the modem port */
48 if ((usbif == 0) && (ptype == MM_PORT_TYPE_AT)) {
49--
501.7.10.4
51
052
=== added file 'debian/patches/git_via-plugin-has-vendor-product-string-probing-so-need_69fe9a8.patch'
--- debian/patches/git_via-plugin-has-vendor-product-string-probing-so-need_69fe9a8.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/git_via-plugin-has-vendor-product-string-probing-so-need_69fe9a8.patch 2012-11-08 16:29:20 +0000
@@ -0,0 +1,31 @@
1From 69fe9a8b3bae1a9b6d301c5d2e03df2f8271df47 Mon Sep 17 00:00:00 2001
2From: Aleksander Morgado <aleksander@lanedo.com>
3Date: Wed, 24 Oct 2012 10:11:32 +0200
4Subject: [PATCH 2/2] via: plugin has vendor/product string probing, so needs
5 to be sorted last
6
7The flag to get the plugin sorted last allows us to ensure that all plugins
8without vendor/product string probing (e.g. vendor/product ID probing) are run
9before. We don't want the Via plugin to start probing e.g. Huawei modems.
10
11In git master this flag in the plugin is not needed, it is automatically ordered
12last if vendor/product ID probing is set in the plugin.
13---
14 plugins/mm-plugin-via.c | 1 +
15 1 file changed, 1 insertion(+)
16
17diff --git a/plugins/mm-plugin-via.c b/plugins/mm-plugin-via.c
18index 841d8ec..6135b58 100644
19--- a/plugins/mm-plugin-via.c
20+++ b/plugins/mm-plugin-via.c
21@@ -30,6 +30,7 @@ mm_plugin_create (void)
22 {
23 return MM_PLUGIN (g_object_new (MM_TYPE_PLUGIN_VIA,
24 MM_PLUGIN_BASE_NAME, "Via CBP7",
25+ MM_PLUGIN_BASE_SORT_LAST, TRUE,
26 NULL));
27 }
28
29--
301.7.10.4
31
032
=== modified file 'debian/patches/series'
--- debian/patches/series 2012-09-25 20:51:14 +0000
+++ debian/patches/series 2012-11-08 16:29:20 +0000
@@ -1,4 +1,5 @@
1# patches for modemmanager1# patches for modemmanager
20001-huawei-better-detection-of-data-port-on-some-modems.patch
2git_lte_4g_parsing_90489ae.patch3git_lte_4g_parsing_90489ae.patch
3git_lte_etsi_mode_0af47c7.patch4git_lte_etsi_mode_0af47c7.patch
4git_better_handle_ucs2_convert_e07c216.patch5git_better_handle_ucs2_convert_e07c216.patch

Subscribers

People subscribed via source and target branches