From 900d2ccfe45b87b8c52ea4e5639cb8555329eb05 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Thu, 6 May 2021 23:31:39 +0200 Subject: [PATCH] btrfs-progs: ci: install static libs to Tumbleweed image All the static versions of libraries are available on Tumbleweed, let's add them to the image. Signed-off-by: David Sterba --- ci/README.md | 2 -- ci/images/ci-openSUSE-tumbleweed-x86_64/Dockerfile | 9 +++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ci/README.md b/ci/README.md index 47ba0004..38733ea8 100644 --- a/ci/README.md +++ b/ci/README.md @@ -126,8 +126,6 @@ To do: - 32bit coverage -- while this architecture is fading out, it may be useful to still have some coverage, however running 32bit docker in 64bit is not considered experimental does not work out of the box -- static build -- when all build dependencies provide the static library - versions, it's possible to to build the static binaries of all the tools - add some kind of templates, there's a lot of repeated stuff in the *Dockerfile*s and the scripts need to be inside the directories in order to allow copying them to the image diff --git a/ci/images/ci-openSUSE-tumbleweed-x86_64/Dockerfile b/ci/images/ci-openSUSE-tumbleweed-x86_64/Dockerfile index 2e3021d1..88d9e3eb 100644 --- a/ci/images/ci-openSUSE-tumbleweed-x86_64/Dockerfile +++ b/ci/images/ci-openSUSE-tumbleweed-x86_64/Dockerfile @@ -20,6 +20,11 @@ RUN zypper install -y --no-recommends udev device-mapper acl attr xz # For debugging RUN zypper install -y --no-recommends less vim +# Static build +RUN zypper install -y --no-recommends glibc-devel-static libblkid-devel-static \ + libcom_err-devel-static libext2fs-devel-static libuuid-devel-static \ + libzstd-devel-static lzo-devel-static zlib-devel-static + COPY ./test-build . COPY ./run-tests . COPY ./devel.tar.gz . @@ -30,3 +35,7 @@ CMD ./test-build devel --disable-documentation # cd /tmp # (see CMD above) # ./run-tests /tmp/btrfs-progs-devel +# +# To test static build: +# cd btrfs-progs-devel +# make static