Ubuntu
modemmanager package

Merge lp://qastaging/~binli/ubuntu/trusty/modemmanager/lp1441095 into lp://qastaging/ubuntu/trusty/modemmanager

  1. Trusty (14.04)
  2. lp1441095
  3. Merge into trusty
Proposed by Bin Li
Status: Merged
Merged at revision: 43
Proposed branch: lp://qastaging/~binli/ubuntu/trusty/modemmanager/lp1441095
Merge into: lp://qastaging/ubuntu/trusty/modemmanager
Diff against target: 7408 lines (+6673/-382)
33 files modified
.pc/applied-patches (+7/-0)
.pc/dell-mbim-plugin.patch/plugins/Makefile.am (+419/-0)
.pc/dell-mbim-plugin.patch/plugins/novatel/mm-plugin-novatel.c (+127/-0)
.pc/mbm-common-library.patch/plugins/Makefile.am (+400/-0)
.pc/new-sierra-legacy-plugin.patch/plugins/Makefile.am (+411/-0)
.pc/new-sierra-legacy-plugin.patch/plugins/sierra/mm-plugin-sierra.c (+129/-0)
.pc/novatel-common-library.patch/plugins/Makefile.am (+381/-0)
.pc/novatel-custom-init.patch/plugins/Makefile.am (+379/-0)
.pc/novatel-custom-init.patch/plugins/novatel/mm-plugin-novatel.c (+259/-0)
.pc/sierra-common-library.patch/plugins/Makefile.am (+391/-0)
.pc/sierra-custom-init.patch/plugins/sierra/mm-common-sierra.c (+312/-0)
.pc/sierra-custom-init.patch/plugins/sierra/mm-common-sierra.h (+49/-0)
.pc/sierra-custom-init.patch/plugins/sierra/mm-plugin-sierra.c (+332/-0)
debian/changelog (+6/-0)
debian/patches/dell-mbim-plugin.patch (+566/-0)
debian/patches/mbm-common-library.patch (+49/-0)
debian/patches/new-sierra-legacy-plugin.patch (+295/-0)
debian/patches/novatel-common-library.patch (+51/-0)
debian/patches/novatel-custom-init.patch (+392/-0)
debian/patches/series (+7/-0)
debian/patches/sierra-common-library.patch (+54/-0)
debian/patches/sierra-custom-init.patch (+531/-0)
plugins/Makefile.am (+66/-17)
plugins/dell/mm-plugin-dell.c (+440/-0)
plugins/dell/mm-plugin-dell.h (+46/-0)
plugins/novatel/mm-common-novatel.c (+165/-0)
plugins/novatel/mm-common-novatel.h (+31/-0)
plugins/novatel/mm-plugin-novatel.c (+4/-138)
plugins/sierra/mm-common-sierra.c (+208/-0)
plugins/sierra/mm-common-sierra.h (+17/-0)
plugins/sierra/mm-plugin-sierra-legacy.c (+99/-0)
plugins/sierra/mm-plugin-sierra-legacy.h (+40/-0)
plugins/sierra/mm-plugin-sierra.c (+10/-227)
To merge this branch: bzr merge lp://qastaging/~binli/ubuntu/trusty/modemmanager/lp1441095
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Bin Li Pending
Review via email: mp+272054@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2015-04-13.

Description of the change

Support the MBIM for Dell.

dell-mbim-plugin.patch need novatel-custom-init.patch and sierra-custom-init.patch.

It built successfully, but not test it yet.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote : Posted in a previous version of this proposal

Thanks but before doing a backport to trusty the issue should be fixed in wily...

Revision history for this message
Iain Lane (laney) wrote : Posted in a previous version of this proposal

said on #ubuntu-desktop

02/09 11:56:37 <Laney> BinLi: hi, I hope you're the right BinLi. Can you look to fix wily for https://code.launchpad.net/~binli/ubuntu/trusty/modemmanager/lp1441095/+merge/255935 per seb128's
                       comment please?
02/09 11:57:45 <Laney> If it's cherry-picks from upstream this can probably go via Debian and maybe cyphermox can help you there

-> Work In Progress - please reset to Needs Review once this is done. Also could you merge the two changelog entries into one please?

Revision history for this message
Bin Li (binli) wrote : Posted in a previous version of this proposal

Iain & seb128,

 Thanks for your reply, this week is holiday in China, I will update it next week.

Revision history for this message
Bin Li (binli) wrote : Posted in a previous version of this proposal

@Iain, @Seb128,

 In trusty, I have finished the patches, I separated the previous patches based on the upstream commit, I merged these together for convenient in first version, I back-ported modemmanager from master branch(1.5) to trusty(1.0), some data structure was changed which I have updated in the backported patches.

 For Wily, we need to backport these patch from master branch(1.5) to 1.4 which is used by wily, I'm still working on it.

 And yes, if it could be cherry-picks from upstream(1.5) to 1.4, it's the best way, could we let cyphermox to help us? Thanks!

Revision history for this message
Bin Li (binli) wrote : Posted in a previous version of this proposal

@Iain, @Seb128,

 I have done for trusty and wily. Thanks!

review: Needs Resubmitting
Revision history for this message
Bin Li (binli) wrote : Posted in a previous version of this proposal

Sorry, I just resubmit it to change the status

Revision history for this message
Shih-Yuan Lee (fourdollars) :
Revision history for this message
Bin Li (binli) wrote :

Follow Shi-Yuan's advice, I uncommitted the seven commits, and do one commit.
And update the bug number and series for release.
Thanks a lot!

lp://qastaging/~binli/ubuntu/trusty/modemmanager/lp1441095 updated
43. By Bin Li

 * Support the MBIM for Dell. (LP: #1441095)

Revision history for this message
Bin Li (binli) wrote :

Again, with Shi-Yuan's feedback, we should follow the previous code.

http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/modemmanager/trusty/revision/40

I just recommit it with applying all the patches with 'quilt push -a', and ignore all the .timestamp files.

Thanks a lot!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: