snappy-hwe-snaps

Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/modem-manager:new-way into ~snappy-hwe-team/snappy-hwe-snaps/+git/modem-manager:snap-20

  1. Git
  2. lp:~alfonsosanchezbeato/snappy-hwe-snaps/+git/modem-manager
  3. new-way
  4. Merge into snap-20
Proposed by Alfonso Sanchez-Beato
Status: Merged
Approved by: Alfonso Sanchez-Beato
Approved revision: f851a5c7f886e2af10f6efbda4c874a8f1ccf256
Merged at revision: ddbebdb664524d1a58c35bd77d6b7cc4621f36cf
Proposed branch: ~alfonsosanchezbeato/snappy-hwe-snaps/+git/modem-manager:new-way
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/modem-manager:snap-20
Diff against target: 164 lines (+60/-43)
2 files modified
snapcraft.yaml (+43/-43)
unstage.txt (+17/-0)
Reviewer Review Type Date Requested Status
System Enablement Bot continuous-integration Approve
Review via email: mp+386170@code.launchpad.net

Commit message

Remove modemmanager-phony, that is done by stack-snaps-tools now
Stage all deb docs, not only copyright
Avoid staging *la (libtool) files
Use $SNAPCRAFT_PART_INSTALL instead of hard-coded path
Check versions from modemmanager part
Build now from latest focal version
Make modemmanager part build after getting aux scripts
Add part to get tools and prime modemmanager debs
Put changelog in snap/ folder
Remove part that copied copyright

Description of the change

Remove modemmanager-phony, that is done by stack-snaps-tools now
Stage all deb docs, not only copyright
Avoid staging *la (libtool) files
Use $SNAPCRAFT_PART_INSTALL instead of hard-coded path
Check versions from modemmanager part
Build now from latest focal version
Make modemmanager part build after getting aux scripts
Add part to get tools and prime modemmanager debs
Put changelog in snap/ folder
Remove part that copied copyright

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: f851a5c7f886e2af10f6efbda4c874a8f1ccf256

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

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

PASSED: Continuous integration, rev:f851a5c7f886e2af10f6efbda4c874a8f1ccf256
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/496/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/529
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/529
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/529
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/529
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1318
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1060
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1109/console

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 587ab20..e847641 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -67,25 +67,46 @@ parts:
67 mmcli: bin/mmcli67 mmcli: bin/mmcli
68 mmcli-internal: bin/mmcli-internal68 mmcli-internal: bin/mmcli-internal
6969
70 modemmanager-data:
71 plugin: dump
72 source: data
73 organize:
74 copyright: usr/share/doc/modem-manager/copyright
75
76 changelog:70 changelog:
77 plugin: nil71 plugin: nil
78 override-build: |72 override-build: |
79 cp "$SNAPCRAFT_PROJECT_DIR"/ChangeLog "$SNAPCRAFT_PART_INSTALL"73 cp "$SNAPCRAFT_PROJECT_DIR"/ChangeLog "$SNAPCRAFT_PART_INSTALL"
80 organize:74 organize:
81 ChangeLog: usr/share/doc/modem-manager/ChangeLog75 ChangeLog: snap/ChangeLog
76
77 # Get aux scripts so they can be used in other parts. Also, stage
78 # packages we rebuild later to get copyright and ensure they are in
79 # the manifest.
80 stack-snaps-tools:
81 plugin: nil
82 source: https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/stack-snaps-tools
83 source-type: git
84 build-packages:
85 - dpkg-dev
86 - git
87 stage-packages:
88 - modemmanager
89 - libmm-glib0
90 override-build: |
91 set -ex
92 find "$SNAPCRAFT_PART_INSTALL"/ -type f,l \
93 -not -path "$SNAPCRAFT_PART_INSTALL"/'usr/share/doc/modemmanager*' \
94 -and -not -path "$SNAPCRAFT_PART_INSTALL"/'usr/share/doc/libmm-glib0*' \
95 -delete
96 find "$SNAPCRAFT_PART_INSTALL"/ -type d -empty -delete
97 mkdir -p "$SNAPCRAFT_PART_INSTALL"/build-tools
98 cp build-tools/* "$SNAPCRAFT_PART_INSTALL"/build-tools
99 prime:
100 - usr/share/doc/modemmanager
101 - usr/share/doc/libmm-glib0
82102
83 modemmanager:103 modemmanager:
84 plugin: autotools104 plugin: autotools
105 after: [ stack-snaps-tools ]
85106
86 source: https://git.launchpad.net/ubuntu/+source/modemmanager107 source: https://git.launchpad.net/ubuntu/+source/modemmanager
87 source-type: git108 source-type: git
88 source-branch: applied/1.12.8-1109 source-branch: applied/ubuntu/focal
89110
90 autotools-configure-parameters:111 autotools-configure-parameters:
91 - --prefix=/usr112 - --prefix=/usr
@@ -138,65 +159,44 @@ parts:
138 - libmbim-utils159 - libmbim-utils
139 - libgudev-1.0-0160 - libgudev-1.0-0
140161
141 override-pull: |162 override-build: |
142 snapcraftctl pull163 set -ex
164 "$SNAPCRAFT_STAGE"/build-tools/check-versions modemmanager
165 # Apply snap related patches
143 git config user.email "snapcraft@canonical.com"166 git config user.email "snapcraft@canonical.com"
144 git config user.name "snapcraft"167 git config user.name "snapcraft"
145 git am "$SNAPCRAFT_PROJECT_DIR"/patch/*.patch168 git am "$SNAPCRAFT_PROJECT_DIR"/patch/*.patch
146169 # Build
147 override-build: |
148 ./autogen.sh170 ./autogen.sh
149 snapcraftctl build171 snapcraftctl build
150 # Run all tests ModemManager ships by default172 # Run all tests ModemManager ships by default
151 make check173 make check
152 # Strip binaries174 # Strip binaries
153 find ../install -executable -type f | xargs file -Ni |175 find "$SNAPCRAFT_PART_INSTALL"/ -executable -type f | xargs file -Ni |
154 grep 'application/x-executable\|application/x-sharedlib' | cut -d: -f1 | xargs strip176 grep 'application/x-executable\|application/x-sharedlib' | cut -d: -f1 | xargs strip
155177
156 filesets:178 filesets:
157 wanted:179 wanted:
158 - usr/bin/mmcli180 - usr/bin/mmcli
159 - usr/sbin/ModemManager181 - usr/sbin/ModemManager
160 - usr/lib/ModemManager/182 - usr/lib/ModemManager/*so
161 - usr/lib/*/libgudev-1.0.so*183 - usr/lib/*/libgudev-1.0.so*
162 - usr/lib/libmm-glib.so*184 - usr/lib/libmm-glib.so*
163 - usr/share/doc/libgudev-1.0-0/copyright185 - usr/share/doc/libgudev-1.0-0
164 - usr/lib/*/libmbim-glib.so*186 - usr/lib/*/libmbim-glib.so*
165 - usr/lib/libmbim/mbim-proxy187 - usr/lib/libmbim/mbim-proxy
166 - usr/bin/mbimcli188 - usr/bin/mbimcli
167 - usr/bin/mbim-network189 - usr/bin/mbim-network
168 - usr/share/doc/libmbim-glib4/copyright190 - usr/share/doc/libmbim-glib4
169 - usr/share/doc/libmbim-proxy/copyright191 - usr/share/doc/libmbim-proxy
170 - usr/share/doc/libmbim-utils/copyright192 - usr/share/doc/libmbim-utils
171 - usr/lib/*/libqmi-glib.so*193 - usr/lib/*/libqmi-glib.so*
172 - usr/lib/libqmi/qmi-proxy194 - usr/lib/libqmi/qmi-proxy
173 - usr/bin/qmicli195 - usr/bin/qmicli
174 - usr/bin/qmi-network196 - usr/bin/qmi-network
175 - usr/share/doc/libqmi-glib5/copyright197 - usr/share/doc/libqmi-glib5
176 - usr/share/doc/libqmi-proxy/copyright198 - usr/share/doc/libqmi-proxy
177 - usr/share/doc/libqmi-utils/copyright199 - usr/share/doc/libqmi-utils
178200
179 prime:201 prime:
180 - $wanted202 - $wanted
181
182 # This part is to make sure we get notifications from the review tools
183 modemmanager-phony:
184 after: [ modemmanager, changelog, modemmanager-hooks,
185 modemmanager-bin, modemmanager-data ]
186 plugin: nil
187 source: https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git/stack-snaps-tools
188 source-type: git
189 build-packages:
190 - python3-minimal
191 - python3-yaml
192 stage-packages:
193 - modemmanager
194 # Check versions and make sure nothing from the staged packages is installed
195 override-build: |
196 #./build-tools/cmp-stage-build.py modemmanager modemmanager
197 rm -rf ../install/*
198 # Find out packages not primed in the end, for CI consumption
199 #override-prime: |
200 # mkdir -p snap
201 # "$SNAPCRAFT_PART_SRC"/build-tools/find-non-primed-pkgs.sh \
202 # "$SNAPCRAFT_PROJECT_DIR" snap/unstage.txt
diff --git a/unstage.txt b/unstage.txt
index 9b3c45a..1fc3d74 100644
--- a/unstage.txt
+++ b/unstage.txt
@@ -1,3 +1,20 @@
1libffi61libffi6
2libglib2.0-02libglib2.0-0
3libpolkit-gobject-1-03libpolkit-gobject-1-0
4gcc-10-base
5libblkid1
6libc6
7libcrypt1
8libffi7
9libgcc-s1
10libgcrypt20
11libgpg-error0
12liblz4-1
13liblzma5
14libmount1
15libpcre2-8-0
16libpcre3
17libselinux1
18libsystemd0
19libudev1
20zlib1g

Subscribers

People subscribed via source and target branches