-
Notifications
You must be signed in to change notification settings - Fork 367
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Assuming all our devs are already at least on F40 on their workstations, just finally drop the gdb-headless workaround. The original bug (#2310156) was fixed in both F40 and 41. This also simplifies the special-casing for "rpm -e" a bit.
- Loading branch information
Showing
1 changed file
with
12 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
# Supported Fedora releases: 39 40 41 | ||
# Supported Fedora releases: 40 41 | ||
FROM registry.fedoraproject.org/fedora:40 AS base | ||
MAINTAINER [email protected] | ||
|
||
|
@@ -47,12 +47,14 @@ RUN dnf -y install \ | |
tar unzip gzip bzip2 cpio xz p7zip \ | ||
pkgconfig \ | ||
/usr/bin/systemd-sysusers \ | ||
gdb-headless \ | ||
dwz \ | ||
fsverity-utils fsverity-utils-devel \ | ||
pandoc \ | ||
sequoia-sq \ | ||
libasan \ | ||
libubsan | ||
libubsan \ | ||
&& dnf clean all | ||
|
||
RUN echo "%_dbpath $(rpm --eval '%_dbpath')" > /root/.rpmmacros | ||
|
||
|
@@ -61,17 +63,14 @@ RUN echo "%_dbpath $(rpm --eval '%_dbpath')" > /root/.rpmmacros | |
RUN ln -sf $(rpm --eval '%{_target_platform}%{?_gnu}')-pkg-config \ | ||
/usr/bin/pkg-config | ||
|
||
# F40 and older (no dnf5) require special handling | ||
RUN if which dnf5; then \ | ||
dnf -y install gdb-headless; \ | ||
dnf clean all; \ | ||
else \ | ||
dnf -y install "gdb-headless < 15"; \ | ||
dnf clean all; \ | ||
rpm -e --nodeps --nodb rpm-sign-libs python3-rpm; \ | ||
fi | ||
|
||
RUN rpm -e --nodeps --nodb \ | ||
# Self-destruct stock rpm | ||
RUN if ! which dnf5; then \ | ||
# Fedora 40 \ | ||
rpm -e --nodeps --nodb \ | ||
rpm-sign-libs \ | ||
python3-rpm; \ | ||
fi; \ | ||
rpm -e --nodeps --nodb \ | ||
rpm \ | ||
rpm-libs \ | ||
rpm-build-libs | ||
|