snappy-hwe-snaps

Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:clean-up into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:master

  1. Git
  2. lp:~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager
  3. clean-up
  4. Merge into master
Proposed by Alfonso Sanchez-Beato
Status: Merged
Approved by: Alfonso Sanchez-Beato
Approved revision: 82280e5c7a2a61b29f889f7d56dc9d071299b4a1
Merged at revision: d05df6da70a69ee56cfe1e262e44c09b4fb1cbf2
Proposed branch: ~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:clean-up
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:master
Diff against target: 40 lines (+14/-2)
2 files modified
snapcraft.yaml (+10/-2)
unstage.txt (+4/-0)
Reviewer Review Type Date Requested Status
System Enablement Bot continuous-integration Approve
Review via email: mp+377873@code.launchpad.net

Commit message

Stage only copyright of staged packages
Some copyright files were not needed as they come from packages from
which we do not take any file.

Do not stage libsqlite3
libsqlite3 is already included in the core snap.

Add unstage.txt file
This file contains a list of debian package that we are not actually
staging, although snapcraft adds them to manifest.yaml. CI now
recognizes this file, and manually removes the listed packages from the
manifest when releasing a snap to the store.

Description of the change

Stage only copyright of staged packages
Some copyright files were not needed as they come from packages from
which we do not take any file.

Do not stage libsqlite3
libsqlite3 is already included in the core snap.

Add unstage.txt file
This file contains a list of debian package that we are not actually
staging, although snapcraft adds them to manifest.yaml. CI now
recognizes this file, and manually removes the listed packages from the
manifest when releasing a snap to the store.

To post a comment you must log in.
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Successfully build documentation, rev: 82280e5c7a2a61b29f889f7d56dc9d071299b4a1

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1289/

Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

FAILED: Continuous integration, rev:82280e5c7a2a61b29f889f7d56dc9d071299b4a1
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/466/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/497/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/497
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/497
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/497
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1289
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1031
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1079/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/466/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Successfully build documentation, rev: 82280e5c7a2a61b29f889f7d56dc9d071299b4a1

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1290/

Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

FAILED: Continuous integration, rev:82280e5c7a2a61b29f889f7d56dc9d071299b4a1
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/467/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/498/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/498
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/498
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/498
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1290
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1032
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1080/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/467/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Successfully build documentation, rev: 82280e5c7a2a61b29f889f7d56dc9d071299b4a1

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1291/

Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Continuous integration, rev:82280e5c7a2a61b29f889f7d56dc9d071299b4a1
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/468/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/499
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/499
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/499
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/499
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1291
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1033
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1081/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/468/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snapcraft.yaml b/snapcraft.yaml
2index 29ca92e..84a5ea6 100644
3--- a/snapcraft.yaml
4+++ b/snapcraft.yaml
5@@ -172,7 +172,16 @@ parts:
6 configs:
7 - etc/NetworkManager/*
8 docs:
9- - usr/share/doc/*/copyright
10+ - usr/share/doc/inotify-tools/copyright
11+ - usr/share/doc/iputils-arping/copyright
12+ - usr/share/doc/libdbus-glib-1-2/copyright
13+ - usr/share/doc/libgudev-1.0-0/copyright
14+ - usr/share/doc/libinotifytools0/copyright
15+ - usr/share/doc/libmm-glib0/copyright
16+ - usr/share/doc/libndp0/copyright
17+ - usr/share/doc/libnspr4/copyright
18+ - usr/share/doc/libnss3/copyright
19+ - usr/share/doc/network-manager/copyright
20 rdepends:
21 - usr/lib/libnm*
22 - usr/lib/*/libdbus-glib*
23@@ -185,7 +194,6 @@ parts:
24 - usr/lib/*/libplc4*
25 - usr/lib/*/libplds4*
26 - usr/lib/*/libsmime3*
27- - usr/lib/*/libsqlite3*
28 - usr/lib/*/nss/*
29 unwanted:
30 # We don't use dhclient so we don't need this helper
31diff --git a/unstage.txt b/unstage.txt
32new file mode 100644
33index 0000000..66febe6
34--- /dev/null
35+++ b/unstage.txt
36@@ -0,0 +1,4 @@
37+libdbus-1-3
38+libffi6
39+libglib2.0-0
40+libnss3-nssdb

Subscribers

People subscribed via source and target branches