From 303ed60e5753499e671f8f283e8fa3b897e40f38 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Tue, 27 Aug 2024 01:18:25 +0100 Subject: [PATCH 1/2] feat: build Fedora 41 RPM packages Signed-off-by: Robert Sturla Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 36c9cf2dac115b142f3cef7b75f4d66a29cfa6cc) Signed-off-by: Sebastiaan van Stijn --- Jenkinsfile | 1 + rpm/Makefile | 2 +- rpm/fedora-41/Dockerfile | 26 ++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 rpm/fedora-41/Dockerfile diff --git a/Jenkinsfile b/Jenkinsfile index 6d70ca9321..54fce93ec2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,6 +8,7 @@ def pkgs = [ [target: "debian-bookworm", image: "debian:bookworm", arches: ["amd64", "aarch64", "armhf"]], // Debian 12 (Next stable) [target: "fedora-39", image: "fedora:39", arches: ["amd64", "aarch64"]], // EOL: November 12, 2024 [target: "fedora-40", image: "fedora:40", arches: ["amd64", "aarch64"]], // EOL: May 13, 2025 + [target: "fedora-41", image: "fedora:41", arches: ["amd64", "aarch64"]], // EOL: November, 2025 [target: "raspbian-bullseye", image: "balenalib/rpi-raspbian:bullseye", arches: ["armhf"]], // Debian/Raspbian 11 (stable) [target: "raspbian-bookworm", image: "balenalib/rpi-raspbian:bookworm", arches: ["armhf"]], // Debian/Raspbian 12 (next stable) [target: "ubuntu-focal", image: "ubuntu:focal", arches: ["amd64", "aarch64", "armhf"]], // Ubuntu 20.04 LTS (End of support: April, 2025. EOL: April, 2030) diff --git a/rpm/Makefile b/rpm/Makefile index da37c205c8..a8ec305eea 100644 --- a/rpm/Makefile +++ b/rpm/Makefile @@ -61,7 +61,7 @@ RUN?=docker run --rm \ $(RUN_FLAGS) \ rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS) -FEDORA_RELEASES ?= fedora-40 fedora-39 +FEDORA_RELEASES ?= fedora-39 fedora-40 fedora-41 CENTOS_RELEASES ?= centos-9 RHEL_RELEASES ?= rhel-8 rhel-9 diff --git a/rpm/fedora-41/Dockerfile b/rpm/fedora-41/Dockerfile new file mode 100644 index 0000000000..e555e51ff4 --- /dev/null +++ b/rpm/fedora-41/Dockerfile @@ -0,0 +1,26 @@ +# syntax=docker/dockerfile:1 + +ARG GO_IMAGE=golang:latest +ARG DISTRO=fedora +ARG SUITE=41 +ARG BUILD_IMAGE=${DISTRO}:${SUITE} + +FROM ${GO_IMAGE} AS golang + +FROM ${BUILD_IMAGE} +ENV GOPROXY=https://proxy.golang.org|direct +ENV GO111MODULE=off +ENV GOPATH=/go +ENV GOTOOLCHAIN=local +ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin +ENV AUTO_GOPATH=1 +ARG DISTRO +ARG SUITE +ENV DISTRO=${DISTRO} +ENV SUITE=${SUITE} +RUN dnf install -y rpm-build rpmlint dnf-plugins-core +COPY --link SPECS /root/rpmbuild/SPECS +RUN dnf builddep -y /root/rpmbuild/SPECS/*.spec +COPY --link --from=golang /usr/local/go /usr/local/go +WORKDIR /root/rpmbuild +ENTRYPOINT ["/bin/rpmbuild"] From 296b712f12afd627b4967850ea4e5daa7b21000e Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 4 Sep 2024 13:49:59 +0200 Subject: [PATCH 2/2] rpm: install binutils-gold as a precaution for arm64 builds This is the equivalent of https://github.com/docker/containerd-packaging/pull/390 for containerd packages, but unlike for containerd packages, we currently do not run into this issue when building docker-ce packages. We're installing this as a precaution, but perhaps it's not needed. go1.21 and up have a patch that enforces the use of ld.gold to work around a bug in GNU binutils. See; - https://github.com/golang/go/issues/22040. - https://github.com/golang/go/commit/cd77738198ffe0c4a1db58352c89f9b2d2a4e85e Fedora 41 and up has a fixed version of binutils, and no longer requires that patch, but may fail without ld.gold installed; /usr/bin/gcc -Wl,-z,now -Wl,-z,nocopyreloc -fuse-ld=gold -o $WORK/b001/exe/a.out -rdynamic /tmp/go-link-1738353519/go.o /tmp/go-link-1738353519/000000.o /tmp/go-link-1738353519/000001.o /tmp/go-link-1738353519/000002.o /tmp/go-link-1738353519/000003.o /tmp/go-link-1738353519/000004.o /tmp/go-link-1738353519/000005.o /tmp/go-link-1738353519/000006.o /tmp/go-link-1738353519/000007.o /tmp/go-link-1738353519/000008.o /tmp/go-link-1738353519/000009.o /tmp/go-link-1738353519/000010.o /tmp/go-link-1738353519/000011.o /tmp/go-link-1738353519/000012.o /tmp/go-link-1738353519/000013.o /tmp/go-link-1738353519/000014.o /tmp/go-link-1738353519/000015.o /tmp/go-link-1738353519/000016.o /tmp/go-link-1738353519/000017.o /tmp/go-link-1738353519/000018.o /tmp/go-link-1738353519/000019.o /tmp/go-link-1738353519/000020.o /tmp/go-link-1738353519/000021.o /tmp/go-link-1738353519/000022.o /tmp/go-link-1738353519/000023.o /tmp/go-link-1738353519/000024.o -O2 -g -lresolv -O2 -g -lpthread -O2 -g -ldl -O2 -g collect2: fatal error: cannot find 'ld' Fedora's build of Go carries a patch for that, but it's not (yet) in upstream; - https://src.fedoraproject.org/rpms/golang/blob/a867bd88a656c1d6e91e7b18bab696dc3fcf1e77/f/0006-Default-to-ld.bfd-on-ARM64.patch - https://src.fedoraproject.org/rpms/golang/c/a867bd88a656c1d6e91e7b18bab696dc3fcf1e77?branch=rawhide Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 563068bcf7e09e3535d4295b8f11e111025cc1ee) Signed-off-by: Sebastiaan van Stijn --- rpm/fedora-41/Dockerfile | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/rpm/fedora-41/Dockerfile b/rpm/fedora-41/Dockerfile index e555e51ff4..ac1c5b7404 100644 --- a/rpm/fedora-41/Dockerfile +++ b/rpm/fedora-41/Dockerfile @@ -19,6 +19,30 @@ ARG SUITE ENV DISTRO=${DISTRO} ENV SUITE=${SUITE} RUN dnf install -y rpm-build rpmlint dnf-plugins-core +# FIXME(thaJeztah): workaround for building on Fedora 41 on arm64 +# +# This is the equivalent of https://github.com/docker/containerd-packaging/pull/390 +# for containerd packages, but unlike for containerd packages, we currently do +# not run into this issue when building docker-ce packages. We're installing +# this as a precaution, but perhaps it's not needed. +# +# go1.21 and up have a patch that enforces the use of ld.gold to work around +# a bug in GNU binutils. See; +# - https://github.com/golang/go/issues/22040. +# - https://github.com/golang/go/commit/cd77738198ffe0c4a1db58352c89f9b2d2a4e85e +# +# Fedora 41 and up has a fixed version of binutils, and no longer requires that +# patch, but may fail without ld.gold installed; +# +# /usr/bin/gcc -Wl,-z,now -Wl,-z,nocopyreloc -fuse-ld=gold -o $WORK/b001/exe/a.out -rdynamic /tmp/go-link-1738353519/go.o /tmp/go-link-1738353519/000000.o /tmp/go-link-1738353519/000001.o /tmp/go-link-1738353519/000002.o /tmp/go-link-1738353519/000003.o /tmp/go-link-1738353519/000004.o /tmp/go-link-1738353519/000005.o /tmp/go-link-1738353519/000006.o /tmp/go-link-1738353519/000007.o /tmp/go-link-1738353519/000008.o /tmp/go-link-1738353519/000009.o /tmp/go-link-1738353519/000010.o /tmp/go-link-1738353519/000011.o /tmp/go-link-1738353519/000012.o /tmp/go-link-1738353519/000013.o /tmp/go-link-1738353519/000014.o /tmp/go-link-1738353519/000015.o /tmp/go-link-1738353519/000016.o /tmp/go-link-1738353519/000017.o /tmp/go-link-1738353519/000018.o /tmp/go-link-1738353519/000019.o /tmp/go-link-1738353519/000020.o /tmp/go-link-1738353519/000021.o /tmp/go-link-1738353519/000022.o /tmp/go-link-1738353519/000023.o /tmp/go-link-1738353519/000024.o -O2 -g -lresolv -O2 -g -lpthread -O2 -g -ldl -O2 -g +# collect2: fatal error: cannot find 'ld' +# +# Fedora's build of Go carries a patch for that, but it's not (yet) in upstream; +# - https://src.fedoraproject.org/rpms/golang/blob/a867bd88a656c1d6e91e7b18bab696dc3fcf1e77/f/0006-Default-to-ld.bfd-on-ARM64.patch +# - https://src.fedoraproject.org/rpms/golang/c/a867bd88a656c1d6e91e7b18bab696dc3fcf1e77?branch=rawhide +# +# As a workaround; install binutils-gold +RUN if [ "$(arch)" = 'aarch64' ]; then dnf -y install binutils-gold; fi COPY --link SPECS /root/rpmbuild/SPECS RUN dnf builddep -y /root/rpmbuild/SPECS/*.spec COPY --link --from=golang /usr/local/go /usr/local/go