zstd compression support is new in 4.15, but isn't currently tested anywhere in CI.
bzip2/zlib was missing in some cases, so add those as well. Signed-off-by: Andrew Cooper <[email protected]> --- CC: Ian Jackson <[email protected]> CC: Wei Liu <[email protected]> CC: Doug Goldstein <[email protected]> For 4.15. Add build time testing for a currently untested feature. This should have been part of the series which included 8169f82049efb but I don't think it really qualifies for a Fixes: tag. RFC for two reasons. First, this needs extending to other containers when I've finished chasing package names, and the CI runs haven't completed yet. --- .cirrus.yml | 2 +- automation/build/alpine/3.12.dockerfile | 2 ++ automation/build/ubuntu/focal.dockerfile | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index fdb1c9c94d..05e72b92db 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -4,7 +4,7 @@ freebsd_template: &FREEBSD_TEMPLATE APPEND_LIB: /usr/local/lib APPEND_INCLUDES: /usr/local/include - install_script: pkg install -y seabios gmake + install_script: pkg install -y seabios gmake zlib bzip2 zstd pkgconf python libiconv bison perl5 yajl lzo2 pixman argp-standalone libxml2 glib git diff --git a/automation/build/alpine/3.12.dockerfile b/automation/build/alpine/3.12.dockerfile index 8631d221db..8d61f3860b 100644 --- a/automation/build/alpine/3.12.dockerfile +++ b/automation/build/alpine/3.12.dockerfile @@ -38,6 +38,8 @@ RUN \ apk add xz-dev && \ apk add yajl-dev && \ apk add zlib-dev && \ + apk add bzip2-dev && \ + apk add zstd-dev && \ \ # qemu build deps apk add bison && \ diff --git a/automation/build/ubuntu/focal.dockerfile b/automation/build/ubuntu/focal.dockerfile index 6c4565745b..0558519a97 100644 --- a/automation/build/ubuntu/focal.dockerfile +++ b/automation/build/ubuntu/focal.dockerfile @@ -30,6 +30,8 @@ RUN apt-get update && \ bin86 \ bcc \ liblzma-dev \ + libzstd-dev \ + libbz2-dev \ # libc6-dev-i386 for Xen < 4.15 libc6-dev-i386 \ libnl-3-dev \ -- 2.11.0
