Skip to content

Commit

Permalink
Support Fedora 41 in Dockerfile
Browse files Browse the repository at this point in the history
This is needed for "make check" to work on a Fedora 41 host where the
FROM directive is overridden to fedora:41.

- Drop the workaround for gdb-headless, the old version no longer exists
  in F41 and the bug has been fixed in both F40 and F41:
  https://bugzilla.redhat.com/show_bug.cgi?id=2310156

- Don't try to remove rpm-sign-libs and python3-rpm on F41 since dnf5 no
  longer pulls them in

- Run the self-removal in --verbose mode so that we actually see what's
  being removed in the image build output
  • Loading branch information
dmnks committed Oct 30, 2024
1 parent bf2c1c3 commit b75ecc6
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions tests/Dockerfile.fedora
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ RUN dnf -y install \
tar unzip gzip bzip2 cpio xz p7zip \
pkgconfig \
/usr/bin/systemd-sysusers \
"gdb-headless < 15" \
gdb-headless \
dwz \
fsverity-utils fsverity-utils-devel \
pandoc \
Expand All @@ -61,12 +61,11 @@ RUN echo "%_dbpath $(rpm --eval '%_dbpath')" > /root/.rpmmacros
RUN ln -sf $(rpm --eval '%{_target_platform}%{?_gnu}')-pkg-config \
/usr/bin/pkg-config

RUN rpm -e --nodeps --nodb \
RUN rpm -e --nodeps --nodb --verbose \
rpm \
rpm-libs \
rpm-build-libs \
rpm-sign-libs \
python3-rpm
$(which dnf5 >/dev/null 2>&1 || echo rpm-sign-libs python3-rpm)

WORKDIR /
CMD /bin/bash
Expand Down

0 comments on commit b75ecc6

Please sign in to comment.