snappy-hwe-snaps

Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/modem-manager:port-snapcraft7 into ~snappy-hwe-team/snappy-hwe-snaps/+git/modem-manager:snap-22

  1. Git
  2. lp:~alfonsosanchezbeato/snappy-hwe-snaps/+git/modem-manager
  3. port-snapcraft7
  4. Merge into snap-22
Proposed by Alfonso Sanchez-Beato
Status: Merged
Approved by: Alfonso Sanchez-Beato
Approved revision: 54213029b421d5f04d5760c01af200b4dfc48d4f
Merged at revision: 15abc9bc550009bd0cf12bbf66006066da37f455
Proposed branch: ~alfonsosanchezbeato/snappy-hwe-snaps/+git/modem-manager:port-snapcraft7
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/modem-manager:snap-22
Diff against target: 101 lines (+31/-35)
1 file modified
snapcraft.yaml (+31/-35)
Reviewer Review Type Date Requested Status
Philip Meulengracht Approve
System Enablement Bot continuous-integration Approve
Review via email: mp+424725@code.launchpad.net

Commit message

Port recipe to snapcraft 7

Description of the change

Port recipe to snapcraft 7

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

FAILED: Continuous integration, rev:54213029b421d5f04d5760c01af200b4dfc48d4f
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/743/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/766
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/766
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/766
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/766
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1548/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1290
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1358/console

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

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

PASSED: Successfully build documentation, rev: 54213029b421d5f04d5760c01af200b4dfc48d4f

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

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

PASSED: Continuous integration, rev:54213029b421d5f04d5760c01af200b4dfc48d4f
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/747/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/770
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/770
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/770
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/770
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/1551
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/1292
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/1360/console

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

review: Approve (continuous-integration)
Revision history for this message
Philip Meulengracht (the-meulengracht) wrote :

LGTM!

review: Approve

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 48cfe2c..604ff7f 100644
3--- a/snapcraft.yaml
4+++ b/snapcraft.yaml
5@@ -70,7 +70,7 @@ parts:
6 changelog:
7 plugin: nil
8 override-build: |
9- cp "$SNAPCRAFT_PROJECT_DIR"/ChangeLog "$SNAPCRAFT_PART_INSTALL"
10+ cp "$CRAFT_PROJECT_DIR"/ChangeLog "$CRAFT_PART_INSTALL"
11 organize:
12 ChangeLog: snap/ChangeLog
13
14@@ -89,13 +89,13 @@ parts:
15 - libmm-glib0
16 override-build: |
17 set -ex
18- find "$SNAPCRAFT_PART_INSTALL"/ -type f,l \
19- -not -path "$SNAPCRAFT_PART_INSTALL"/'usr/share/doc/modemmanager*' \
20- -and -not -path "$SNAPCRAFT_PART_INSTALL"/'usr/share/doc/libmm-glib0*' \
21+ find "$CRAFT_PART_INSTALL"/ -type f,l \
22+ -not -path "$CRAFT_PART_INSTALL"/'usr/share/doc/modemmanager*' \
23+ -and -not -path "$CRAFT_PART_INSTALL"/'usr/share/doc/libmm-glib0*' \
24 -delete
25- find "$SNAPCRAFT_PART_INSTALL"/ -type d -empty -delete
26- mkdir -p "$SNAPCRAFT_PART_INSTALL"/build-tools
27- cp build-tools/* "$SNAPCRAFT_PART_INSTALL"/build-tools
28+ find "$CRAFT_PART_INSTALL"/ -type d -empty -delete
29+ mkdir -p "$CRAFT_PART_INSTALL"/build-tools
30+ cp build-tools/* "$CRAFT_PART_INSTALL"/build-tools
31 prime:
32 - usr/share/doc/modemmanager
33 - usr/share/doc/libmm-glib0
34@@ -163,43 +163,39 @@ parts:
35
36 override-build: |
37 set -ex
38- "$SNAPCRAFT_STAGE"/build-tools/check-versions modemmanager
39+ "$CRAFT_STAGE"/build-tools/check-versions modemmanager
40 # Apply snap related patches
41 git config user.email "snapcraft@canonical.com"
42 git config user.name "snapcraft"
43- git am "$SNAPCRAFT_PROJECT_DIR"/patch/*.patch
44+ git am "$CRAFT_PROJECT_DIR"/patch/*.patch
45 # Build (rename .git so configure sets release flag)
46 mv .git git
47- snapcraftctl build
48+ craftctl default
49 # Run all tests ModemManager ships by default
50 make check
51 mv git .git
52 # Strip binaries
53- find "$SNAPCRAFT_PART_INSTALL"/ -executable -type f | xargs file -Ni |
54+ find "$CRAFT_PART_INSTALL"/ -executable -type f | xargs file -Ni |
55 grep 'application/x-executable\|application/x-sharedlib' | cut -d: -f1 | xargs strip
56
57- filesets:
58- wanted:
59- - usr/bin/mmcli
60- - usr/sbin/ModemManager
61- - usr/lib/ModemManager/*so
62- - usr/lib/*/libgudev-1.0.so*
63- - usr/lib/libmm-glib.so*
64- - usr/share/doc/libgudev-1.0-0
65- - usr/lib/*/libmbim-glib.so*
66- - usr/bin/mbimcli
67- - usr/bin/mbim-network
68- - usr/share/doc/libmbim-glib4
69- - usr/share/doc/libmbim-proxy
70- - usr/share/doc/libmbim-utils
71- - usr/lib/*/libqmi-glib.so*
72- - usr/bin/qmicli
73- - usr/bin/qmi-firmware-update
74- - usr/bin/qmi-network
75- - usr/share/doc/libqmi-glib5
76- - usr/share/doc/libqmi-proxy
77- - usr/share/doc/libqmi-utils
78- - usr/libexec/*
79-
80 prime:
81- - $wanted
82+ - usr/bin/mmcli
83+ - usr/sbin/ModemManager
84+ - usr/lib/ModemManager/*so
85+ - usr/lib/*/libgudev-1.0.so*
86+ - usr/lib/libmm-glib.so*
87+ - usr/share/doc/libgudev-1.0-0
88+ - usr/lib/*/libmbim-glib.so*
89+ - usr/bin/mbimcli
90+ - usr/bin/mbim-network
91+ - usr/share/doc/libmbim-glib4
92+ - usr/share/doc/libmbim-proxy
93+ - usr/share/doc/libmbim-utils
94+ - usr/lib/*/libqmi-glib.so*
95+ - usr/bin/qmicli
96+ - usr/bin/qmi-firmware-update
97+ - usr/bin/qmi-network
98+ - usr/share/doc/libqmi-glib5
99+ - usr/share/doc/libqmi-proxy
100+ - usr/share/doc/libqmi-utils
101+ - usr/libexec/*

Subscribers

People subscribed via source and target branches