Merge ~awe/network-manager/+git/ubuntu:snap-1.10 into network-manager:snap-1.10

Proposed by Tony Espy
Status: Merged
Approved by: Tony Espy
Approved revision: 660001b6f126195ddba7773d8cec5e56c3256aa7
Merge reported by: Tony Espy
Merged at revision: 660001b6f126195ddba7773d8cec5e56c3256aa7
Proposed branch: ~awe/network-manager/+git/ubuntu:snap-1.10
Merge into: network-manager:snap-1.10
Diff against target: 2856 lines (+2737/-1)
19 files modified
debian/10-globally-managed-devices.conf (+1/-1)
debian/changelog (+13/-0)
debian/patches/Support-for-WoWLAN.patch (+892/-0)
debian/patches/add-snap-support.patch (+946/-0)
debian/patches/disable-libnm-glib-test-devices-array.patch (+13/-0)
debian/patches/disable-libnm-glib-wifi-ap-test.patch (+13/-0)
debian/patches/disable-link-bond-test.patch (+14/-0)
debian/patches/disable-link-team-test.patch (+14/-0)
debian/patches/series (+6/-0)
hooks/configure (+62/-0)
snap-common/bin/dhcp-lease-mover (+26/-0)
snap-common/bin/networkmanager (+110/-0)
snap-common/bin/nmcli-internal (+7/-0)
snap-common/bin/ (+159/-0)
snap-common/bin/ (+60/-0)
snap-common/etc/NetworkManager/NetworkManager.conf (+14/-0)
snap-common/startup-hooks/ (+13/-0)
snap-common/usr/share/doc/network-manager/copyright (+74/-0)
snap/snapcraft.yaml (+300/-0)
Reviewer Review Type Date Requested Status
Alfonso Sanchez-Beato (community) Approve
Review via email:

Commit message

Initial snap packaging for network-manager 1.10

Description of the change

This commit provides the initial snap packaging for network-manager 1.10 for Ubuntu Core, to be published in the public snap store by Canonical. Prior versions of the network-manager snaps were built against upstream version of network-manager, and maintained by an defunct team at Canonical:

This new version of the snap is built on top of the bionic version of network-manager using quilt patches, including most (if not all) of the patches released to-date for bionic. As nm 1.10 has some dependencies that are only available from 18.04, this snap is built against the core18 base snap. This snap also includes a pending PR for WoWLAN.

To post a comment you must log in.
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

@Tony why have you removed the configure file? is it creating a conflict with snapcraft? It makes impossible to review the MP easily...

Revision history for this message
Tony Espy (awe) wrote :

Yes, I realized afterwards that the easy diff gets clobbered by the removal of configure [1]. That said, this was done in our snappy-hwe-team snap packaging as well [2].



If there's another way to do this, I'm all ears...

Revision history for this message
Tony Espy (awe) wrote :

I just updated the PR to get rid of the configure removal commit. Instead, I updated the networkmanager part to remove the configure file in the override-build section.

Revision history for this message
Tony Espy (awe) wrote :

I'd also like to discuss removing the 'ethernet.enable' config option, as I think we'd proven that mixing and matching networkd and NetworkManager isn't a good idea.

Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

Great work! I have some comments, but no mayor issues though.

review: Needs Fixing
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

Approving as this has already been released - fixes for the comments will come in another MP.

review: Approve
Revision history for this message
Tony Espy (awe) wrote :

There was indeed a missing patch, so we'll need to get working on some kind of interim plan for CI for this branch.

I amended the 'add snap support' commit, and force-pushed it.

I'll address the remaining comments in separate PRs.

Revision history for this message
Tony Espy (awe) wrote :

Merged and tagged as "snap/1.10.6-20180813_286".

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

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.


People subscribed via source and target branches

to all changes: