From 4ac630b5dc040c58cd7b5116d35181ee49a402d8 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Mon, 4 Dec 2023 18:40:30 +0100 Subject: [PATCH] btrfs-progs: ci: update packages providing pahole Centos 8 does not provide the package at all, on musl it's in the package 'pahole'. Issue: #710 Signed-off-by: David Sterba --- ci/images/ci-centos-8-x86_64/Dockerfile | 2 +- ci/images/ci-musl-i386/Dockerfile | 2 +- ci/images/ci-musl-x86_64/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/images/ci-centos-8-x86_64/Dockerfile b/ci/images/ci-centos-8-x86_64/Dockerfile index e8ef1c8b..edc9ed90 100644 --- a/ci/images/ci-centos-8-x86_64/Dockerfile +++ b/ci/images/ci-centos-8-x86_64/Dockerfile @@ -13,7 +13,7 @@ RUN yum -y install autoconf automake pkg-config RUN yum -y install libattr-devel libblkid-devel libuuid-devel RUN yum -y install e2fsprogs-libs e2fsprogs-devel RUN yum -y install zlib-devel lzo-devel libzstd-devel zstd -RUN yum -y install make gcc tar gzip clang dwarves +RUN yum -y install make gcc tar gzip clang RUN yum -y install python3 python3-devel python3-setuptools # For downloading fresh sources diff --git a/ci/images/ci-musl-i386/Dockerfile b/ci/images/ci-musl-i386/Dockerfile index 16c1a123..912d2beb 100644 --- a/ci/images/ci-musl-i386/Dockerfile +++ b/ci/images/ci-musl-i386/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /tmp RUN apk update RUN apk add linux-headers musl-dev util-linux-dev bash RUN apk add attr-dev acl-dev e2fsprogs-dev zlib-dev lzo-dev zstd-dev -RUN apk add autoconf automake make gcc tar gzip clang +RUN apk add autoconf automake make gcc tar gzip clang pahole RUN apk add python3 py3-setuptools python3-dev RUN apk add libgcrypt-dev libsodium-dev libkcapi-dev diff --git a/ci/images/ci-musl-x86_64/Dockerfile b/ci/images/ci-musl-x86_64/Dockerfile index c8509aee..912d2beb 100644 --- a/ci/images/ci-musl-x86_64/Dockerfile +++ b/ci/images/ci-musl-x86_64/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /tmp RUN apk update RUN apk add linux-headers musl-dev util-linux-dev bash RUN apk add attr-dev acl-dev e2fsprogs-dev zlib-dev lzo-dev zstd-dev -RUN apk add autoconf automake make gcc tar gzip clang dwarves +RUN apk add autoconf automake make gcc tar gzip clang pahole RUN apk add python3 py3-setuptools python3-dev RUN apk add libgcrypt-dev libsodium-dev libkcapi-dev