From eec9627908b44ba94a4ed432bbe8e766226619f7 Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Thu, 4 Jan 2024 13:29:34 +0000 Subject: [PATCH 1/9] snapcraft: Require g++ for edk2 build Signed-off-by: Thomas Parrott --- snapcraft.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/snapcraft.yaml b/snapcraft.yaml index aa589db39..c4849ee5f 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -319,6 +319,7 @@ parts: source-depth: 1 plugin: nil build-packages: + - g++ - on amd64: - acpica-tools - uuid-dev From 3887d4a8d53e18655095150e70162b1712a009f4 Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Fri, 5 Jan 2024 10:32:10 +0000 Subject: [PATCH 2/9] snapcraft: Add dpkg-dev as dependency of lxc To work around https://github.com/mesonbuild/meson/issues/7270 Signed-off-by: Thomas Parrott --- snapcraft.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/snapcraft.yaml b/snapcraft.yaml index c4849ee5f..cf07bedc9 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1266,6 +1266,7 @@ parts: source: https://github.com/lxc/lxc source-type: git build-packages: + - dpkg-dev - libapparmor-dev - libcap-dev - libdbus-1-dev From 97383b4ae4c231c94cc133244ea9f91a91c64c4e Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Fri, 5 Jan 2024 11:13:03 +0000 Subject: [PATCH 3/9] snapcraft: Use libxslt1 rather than virtual libxslt package To get predictability in build and remove snapcraft warning. Signed-off-by: Thomas Parrott --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index cf07bedc9..c3cf7aded 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1379,7 +1379,7 @@ parts: - libacl1-dev - libudev-dev - libxml2-dev - - libxslt-dev + - libxslt1-dev - libblas-dev - libopenblas-dev - liblapack-dev From 7b1a2684e4ad5447be18502440c69d1f5c345501 Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Fri, 5 Jan 2024 11:13:35 +0000 Subject: [PATCH 4/9] snapcraft: Use pypy3 for compatibility with core24 Still works with core22 too. Signed-off-by: Thomas Parrott --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index c3cf7aded..123f94cdf 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1384,7 +1384,7 @@ parts: - libopenblas-dev - liblapack-dev - pkg-config - - pypy-dev + - pypy3-dev - python3-dev - python3-venv build-snaps: From 695eb19ceb6824f045fa9d02d07471b694c368b8 Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Fri, 5 Jan 2024 11:14:58 +0000 Subject: [PATCH 5/9] snapcraft: Add missing bzip2 for qemu build packages Was relying on earlier stages. Signed-off-by: Thomas Parrott --- snapcraft.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/snapcraft.yaml b/snapcraft.yaml index 123f94cdf..ac5708292 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -880,6 +880,7 @@ parts: - --localstatedir=/var/ build-packages: - bison + - bzip2 - flex - pkg-config - libaio-dev From 49762d1dfbf27a79f3c72c3960a15483157fb4c9 Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Fri, 5 Jan 2024 12:39:05 +0000 Subject: [PATCH 6/9] snapcraft: Work around criu build problem with gcc version > 11 Signed-off-by: Thomas Parrott --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index ac5708292..113dc43cd 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -256,7 +256,7 @@ parts: [ "$(uname -m)" != "ppc64le" ] && exit 0 set -ex - make + make USERCFLAGS=-Wno-error=format-truncation mkdir -p "${CRAFT_PART_INSTALL}/criu/" cp criu/criu "${CRAFT_PART_INSTALL}/criu/" organize: From e20a7f3b30e30300c516047d1be1e27281668696 Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Fri, 5 Jan 2024 12:49:13 +0000 Subject: [PATCH 7/9] snapcraft: Update libs used by xfs for core24 Signed-off-by: Thomas Parrott --- snapcraft.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/snapcraft.yaml b/snapcraft.yaml index 113dc43cd..a9e4ef3fa 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1063,6 +1063,7 @@ parts: - bin/xfs_repair - bin/mkfs.xfs - lib/*/libinih.so* + - lib/*/liburcu.so* xtables: plugin: nil From 14889dd078b7400b2e379d7259d9b93c01f617f8 Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Fri, 5 Jan 2024 12:48:53 +0000 Subject: [PATCH 8/9] snapcraft: Update libs used by ceph tooling for core24 Signed-off-by: Thomas Parrott --- snapcraft.yaml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index a9e4ef3fa..526d9e839 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -184,6 +184,8 @@ parts: plugin: nil stage-packages: - ceph-common + - libssh-dev + - libsnappy1v5 organize: usr/bin/: bin/ usr/lib/: lib/ @@ -205,9 +207,10 @@ parts: - lib/*/libibverbs.so* - lib/*/libicudata.so* - lib/*/libicuuc.so* - - lib/*/liblber-2.5.so* - - lib/*/libldap-2.5.so* - - lib/*/liblua5.3.so* + - lib/*/liblber*.so* + - lib/*/libldap*.so* + - lib/*/liblua*.so* + - lib/*/libncurses.so* - lib/*/libndctl.so* - lib/*/libnghttp2.so* - lib/*/liboath.so* @@ -221,6 +224,10 @@ parts: - lib/*/librtmp.so* - lib/*/libsasl2.so* - lib/*/libsnappy.so* + - lib/*/libssh.so* + - lib/*/libtcmalloc.so* + - lib/*/libunistring.so* + - lib/*/libunwind.so* criu: source: https://github.com/checkpoint-restore/criu From e98630f5c67f228a4dadfc94e0f41044d6164312 Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Fri, 5 Jan 2024 13:10:08 +0000 Subject: [PATCH 9/9] snapcraft: Switch to core24 devel Signed-off-by: Thomas Parrott --- snapcraft.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 526d9e839..ed010e411 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,5 +1,6 @@ name: lxd -base: core22 +base: core24 +build-base: devel assumes: - snapd2.39 version: git