Skip to content

Commit

Permalink
Fedora 39 Build Fixes (#88)
Browse files Browse the repository at this point in the history
* Fedora39: Don't use fixed package versions

Specifying version numbers for the packages provided by the Linux
distribution is counterproductive. The available patchlevel versions of a
package can change within a Fedora release. This can breaks image builds
which requires additional manual work. Since the major versions stay
fixed, there should not be any compatibility issues between image
builds. Additionally, bug fixes are picked up automatically.

This patch removes the explicit version numbers from the packages and
installs the default versions instead.

Signed-off-by: Oliver Steffen <[email protected]>

* Fedora 39: Install python-setuptools via pip

Install python-setuptools via pip instead of taking it from the Fedora
repo. This avoids possible conflicts with `pip install --upgrade ...`

Signed-off-by: Oliver Steffen <[email protected]>

---------

Signed-off-by: Oliver Steffen <[email protected]>
  • Loading branch information
osteffenrh authored Dec 11, 2023
1 parent 0bc7964 commit 232e8be
Showing 1 changed file with 9 additions and 14 deletions.
23 changes: 9 additions & 14 deletions Fedora-39/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
# purpose image. It contains the toolchains for all supported architectures, and
# all build dependencies.
FROM registry.fedoraproject.org/fedora:39 AS build
ARG GCC_VERSION=13.2.1-4.fc39
ARG GCC_VERSION_CROSS=13.2.1-1.fc39
ARG NASM_VERSION=2.16.01-4.fc39
ARG PYTHON_VERSION=3.12
ARG CSPELL_VERSION=8.0.0
ARG MARKDOWNLINT_VERSION=0.37.0
ARG POWERSHELL_VERSION=7.4.0
Expand All @@ -33,32 +29,31 @@ RUN dnf \
acpica-tools \
dotnet-runtime-${DOTNET_VERSION} \
curl \
gcc-c++-${GCC_VERSION} \
gcc-${GCC_VERSION} \
gcc-aarch64-linux-gnu-${GCC_VERSION_CROSS} \
gcc-arm-linux-gnu-${GCC_VERSION_CROSS} \
gcc-riscv64-linux-gnu-${GCC_VERSION_CROSS} \
gcc-loongarch64-linux-gnu-${GCC_VERSION_CROSS} \
gcc-c++ \
gcc \
gcc-aarch64-linux-gnu \
gcc-arm-linux-gnu \
gcc-riscv64-linux-gnu \
gcc-loongarch64-linux-gnu \
git \
lcov \
libX11-devel \
libXext-devel \
libuuid-devel \
make \
nuget \
nasm-${NASM_VERSION} \
nasm \
https://github.com/PowerShell/PowerShell/releases/download/v${POWERSHELL_VERSION}/powershell-${POWERSHELL_VERSION}-1.rh.x86_64.rpm \
python${PYTHON_VERSION} \
python3 \
python3-distutils-extra \
python3-pip \
python3-devel \
python3-setuptools \
nodejs \
npm \
tar \
sudo
RUN alternatives --install /usr/bin/python python /usr/bin/python3 1
RUN pip install pip lcov_cobertura setuptools --upgrade
RUN pip install --upgrade pip lcov_cobertura setuptools

ENV GCC5_AARCH64_PREFIX /usr/bin/aarch64-linux-gnu-
ENV GCC5_ARM_PREFIX /usr/bin/arm-linux-gnu-
Expand Down

0 comments on commit 232e8be

Please sign in to comment.