Skip to content

Commit

Permalink
Commit pinning and version bump (canonical#555)
Browse files Browse the repository at this point in the history
`source-commit` is used wherever possible. The one exception is for the
`nvidia-container` part that otherwise fails for a mysterious reason
(see commit message for what was tried).
  • Loading branch information
tomponline authored Sep 19, 2024
2 parents 5f6d483 + dc3ca40 commit 09eb3c3
Showing 1 changed file with 24 additions and 22 deletions.
46 changes: 24 additions & 22 deletions snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,8 @@ parts:

criu:
source: https://github.com/checkpoint-restore/criu
source-commit: f8b14286b092853a4485813e1efd564109df9123 # v3.19
#source-depth: 1
source-tag: v3.19
source-type: git
plugin: nil
build-packages:
Expand Down Expand Up @@ -492,8 +492,8 @@ parts:

libtpms:
source: https://github.com/stefanberger/libtpms
source-commit: f8c2dc7e12a730dcca4220d7ac5ad86d13dfd630 # v0.9.6
source-depth: 1
source-tag: v0.9.6
source-type: git
plugin: autotools
autotools-configure-parameters:
Expand All @@ -507,8 +507,8 @@ parts:

liburing:
source: https://github.com/axboe/liburing
source-commit: f4e42a515cd78c8c9cac2be14222834be5f8df2b # liburing-2.5
source-depth: 1
source-tag: liburing-2.5
source-type: git
plugin: autotools
autotools-configure-parameters:
Expand All @@ -529,8 +529,8 @@ parts:

libusb:
source: https://github.com/libusb/libusb
source-commit: d52e355daa09f17ce64819122cb067b8a2ee0d4b # v1.0.27
source-depth: 1
source-tag: v1.0.27
source-type: git
plugin: autotools
autotools-configure-parameters:
Expand Down Expand Up @@ -598,8 +598,9 @@ parts:

nvidia-container:
source: https://github.com/NVIDIA/libnvidia-container
# XXX: fails to build if using source-commit
source-depth: 1
source-tag: v1.14.6
source-tag: v1.16.1
source-type: git
plugin: make
build-packages:
Expand Down Expand Up @@ -677,8 +678,8 @@ parts:

openvswitch:
source: https://github.com/openvswitch/ovs
source-commit: dfe601bbc154c836e6ec3526a1eb331c1c09a06e # v3.3.2
source-depth: 1
source-tag: v3.3.1
source-type: git
plugin: autotools
autotools-configure-parameters:
Expand All @@ -701,8 +702,8 @@ parts:
after:
- openvswitch
source: https://github.com/ovn-org/ovn
source-commit: 459a3bab4c4a11b904aa3c37015372d34e1e1209 # v24.03.3
source-depth: 1
source-tag: v24.03.2
source-type: git
plugin: autotools
autotools-configure-parameters:
Expand All @@ -715,8 +716,8 @@ parts:

spice-protocol:
source: https://gitlab.freedesktop.org/spice/spice-protocol
source-commit: 6f453a775d87087c6ba59fc180c1a1e466631a47 # v0.14.4
source-depth: 1
source-tag: v0.14.4
source-type: git
plugin: meson
prime: []
Expand All @@ -737,8 +738,9 @@ parts:
after:
- spice-protocol
source: https://gitlab.freedesktop.org/spice/spice
source-depth: 1
source-tag: v0.15.2
source-commit: 0c2c1413a8b387ea597a95b6c867470a7c56c8ab # v0.15.2
# XXX: source-depth does not work with submodules
#source-depth: 1
source-type: git
plugin: meson
meson-parameters:
Expand Down Expand Up @@ -781,8 +783,8 @@ parts:
after:
- libtpms
source: https://github.com/stefanberger/swtpm
source-commit: f756ee8a281ddff7e09b49e1ef00d5cbb42abb63 # v0.9.0
source-depth: 1
source-tag: v0.8.2
source-type: git
plugin: autotools
autotools-configure-parameters:
Expand Down Expand Up @@ -818,8 +820,8 @@ parts:
- spice-protocol
- spice-server
source: https://git.launchpad.net/ubuntu/+source/qemu
source-commit: 7689f1b03bf4b055ef0c96cbece55e0a0c20c725 # import/1%8.2.2+ds-0ubuntu1.2
source-depth: 1
source-tag: import/1%8.2.2+ds-0ubuntu1.2
source-type: git
plugin: autotools
autotools-configure-parameters:
Expand Down Expand Up @@ -1003,8 +1005,8 @@ parts:

sqlite:
source: https://github.com/sqlite/sqlite
source-commit: f3d536d37825302e31ed0eddd811c689f38f85a3 # version-3.46.1
source-depth: 1
source-tag: version-3.45.1
source-type: git
plugin: autotools
autotools-configure-parameters:
Expand All @@ -1017,8 +1019,8 @@ parts:

squashfs-tools-ng:
source: https://github.com/AgentD/squashfs-tools-ng
source-commit: 8f9966c8ea3ea8a854941d041e7fcb9eb4f772fb # v1.3.1
source-depth: 1
source-tag: v1.3.1
source-type: git
plugin: autotools
autotools-configure-parameters:
Expand All @@ -1032,8 +1034,8 @@ parts:

virtiofsd:
source: https://gitlab.com/virtio-fs/virtiofsd
source-commit: d20f4d698c14ada07ea9ff5cb7050c2c4703ff66 # v1.11.1
source-depth: 1
source-tag: v1.10.1
source-type: git
plugin: rust
rust-channel: stable
Expand Down Expand Up @@ -1108,8 +1110,8 @@ parts:
zfs-2-1:
source: https://github.com/openzfs/zfs
source-commit: fb6d532066f23458f768a97ae94b158c42cbe484 # zfs-2.1.15
source-depth: 1
source-tag: zfs-2.1.15
source-type: git
plugin: autotools
autotools-configure-parameters:
Expand Down Expand Up @@ -1143,8 +1145,8 @@ parts:
zfs-2-2:
source: https://github.com/openzfs/zfs
source-commit: baa50314567afd986a00838f0fa65fdacbd12daf # zfs-2.2.6
source-depth: 1
source-tag: zfs-2.2.4
source-type: git
plugin: autotools
autotools-configure-parameters:
Expand Down Expand Up @@ -1190,7 +1192,7 @@ parts:

apparmor:
source: https://gitlab.com/apparmor/apparmor.git
source-commit: 84a6bc1b6dcdfeabb1ed3597f01e314f3bcee5c1 # v4.0.2
source-commit: b4dfdf50f50ed1d64161424d036a2453645f0cfe # v4.0.3
source-depth: 1
source-type: git
plugin: autotools
Expand Down Expand Up @@ -1340,8 +1342,8 @@ parts:
- qemu-ovmf-secureboot
- nftables
source: https://github.com/awslabs/python-uefivars
source-commit: ec1eab1717c65ea36ca7160c96fe0e10e071fb66 # v1.2
source-depth: 1
source-tag: v1.0.0
source-type: git
plugin: python
override-prime: |-
Expand All @@ -1356,7 +1358,7 @@ parts:
organize:
lib/python3.12/site-packages/: lib/python3/dist-packages/
prime:
- bin/uefivars.py
- bin/uefivars
- lib/python3/dist-packages/google_crc32c*
- lib/python3/dist-packages/pyuefivars*

Expand Down Expand Up @@ -1410,7 +1412,7 @@ parts:
ln -s "$(pwd)" "${GOPATH}/src/github.com/canonical/lxd"
# Download the dependencies
go get -d -v ./...
go get -v ./...
override-build: |
set -ex
Expand Down Expand Up @@ -1581,7 +1583,7 @@ parts:
-not -path "${CRAFT_PRIME}/bin/sshfs" \
-not -path "${CRAFT_PRIME}/bin/virt-v2v-in-place" \
-not -path "${CRAFT_PRIME}/bin/xfs_admin" \
-not -path "${CRAFT_PRIME}/bin/uefivars.py" \
-not -path "${CRAFT_PRIME}/bin/uefivars" \
-not -path "${CRAFT_PRIME}/bin/lxcfs" \
-not -path "${CRAFT_PRIME}/bin/gpu-2404-custom-wrapper" \
-exec strip -s {} +
Expand Down

0 comments on commit 09eb3c3

Please sign in to comment.