From 4d61d1ced30114305bec8e9c087d51f12cb14cfa Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Wed, 10 Jul 2024 08:30:11 -0400 Subject: [PATCH 1/2] snapcraft: sort primed libs for ceph part Signed-off-by: Simon Deziel --- snapcraft.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 08b108716..f6a0a05ea 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -232,8 +232,12 @@ parts: - lib/*/libicudata.so* - lib/*/libicuuc.so* - lib/*/liblber-2.5.so* + - lib/*/liblber.so* - lib/*/libldap-2.5.so* + - lib/*/libldap.so* + - lib/*/liblmdb.so* - lib/*/liblua5.4.so* + - lib/*/libncurses.so* - lib/*/libndctl.so* - lib/*/libnghttp2.so* - lib/*/liboath.so* @@ -247,13 +251,9 @@ parts: - lib/*/librtmp.so* - lib/*/libsasl2.so* - lib/*/libsnappy.so* - - lib/*/libncurses.so* - - lib/*/liblber.so* - - lib/*/libldap.so* - lib/*/libssh.so* - - lib/*/liblmdb.so* - - lib/*/libunwind.so* - lib/*/libtcmalloc.so* + - lib/*/libunwind.so* criu: source: https://github.com/checkpoint-restore/criu From 0eb7b80f0d9289ea6ccad062749768041461697c Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Wed, 10 Jul 2024 10:18:01 -0400 Subject: [PATCH 2/2] snapcraft: add explicit depend on libsnappy1v5 Signed-off-by: Simon Deziel --- snapcraft.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/snapcraft.yaml b/snapcraft.yaml index f6a0a05ea..bf39068c5 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -191,14 +191,19 @@ parts: - libatomic plugin: nil stage-packages: + # XXX: explicitly depend on libsnappy1v5 due to https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/2072656 - on amd64: - ceph-common + - libsnappy1v5 - on arm64: - ceph-common + - libsnappy1v5 - on ppc64el: - ceph-common + - libsnappy1v5 - on s390x: - ceph-common + - libsnappy1v5 organize: usr/bin/: bin/ usr/lib/: lib/