From 5d5d7af90b73578b06dd5a1645560fabcd66c112 Mon Sep 17 00:00:00 2001 From: Antonio SJ Musumeci Date: Mon, 2 Nov 2026 18:57:58 -0600 Subject: [PATCH] Add Fedora 45 and Ubuntu 26.10 build targets --- buildtools/containerfiles/fedora:45.amd64 | 10 ++++++++++ buildtools/containerfiles/fedora:45.arm64 | 10 ++++++++++ buildtools/containerfiles/ubuntu:26.10.amd64 | 10 ++++++++++ buildtools/containerfiles/ubuntu:26.10.arm64 | 10 ++++++++++ buildtools/containerfiles/ubuntu:26.10.armhf | 10 ++++++++++ buildtools/containerfiles/ubuntu:26.10.riscv64 | 10 ++++++++++ buildtools/target-containers.txt | 16 ++++++++++++++++ mkdocs/docs/setup/build.md | 12 ++++++++++++ mkdocs/docs/setup/installation.md | 10 +++++----- 9 files changed, 93 insertions(+), 5 deletions(-) create mode 100644 buildtools/containerfiles/fedora:45.amd64 create mode 100644 buildtools/containerfiles/fedora:45.arm64 create mode 100644 buildtools/containerfiles/ubuntu:26.10.amd64 create mode 100644 buildtools/containerfiles/ubuntu:26.10.arm64 create mode 100644 buildtools/containerfiles/ubuntu:26.10.armhf create mode 100644 buildtools/containerfiles/ubuntu:26.10.riscv64 diff --git a/buildtools/containerfiles/fedora:45.amd64 b/buildtools/containerfiles/fedora:45.amd64 new file mode 100644 index 00000000..93f45d36 --- /dev/null +++ b/buildtools/containerfiles/fedora:45.amd64 @@ -0,0 +1,10 @@ +FROM --platform=amd64 fedora:45 as build +COPY install-build-pkgs build-mergerfs /tmp/ +RUN /tmp/install-build-pkgs +ARG BUILD_TIMESTAMP=0 +ARG GIT_REPO +ARG BRANCH +RUN /tmp/build-mergerfs $GIT_REPO $BRANCH + +FROM scratch +COPY --from=build /build/ / diff --git a/buildtools/containerfiles/fedora:45.arm64 b/buildtools/containerfiles/fedora:45.arm64 new file mode 100644 index 00000000..adc7a118 --- /dev/null +++ b/buildtools/containerfiles/fedora:45.arm64 @@ -0,0 +1,10 @@ +FROM --platform=arm64 fedora:45 as build +COPY install-build-pkgs build-mergerfs /tmp/ +RUN /tmp/install-build-pkgs +ARG BUILD_TIMESTAMP=0 +ARG GIT_REPO +ARG BRANCH +RUN /tmp/build-mergerfs $GIT_REPO $BRANCH + +FROM scratch +COPY --from=build /build/ / diff --git a/buildtools/containerfiles/ubuntu:26.10.amd64 b/buildtools/containerfiles/ubuntu:26.10.amd64 new file mode 100644 index 00000000..854b8b7c --- /dev/null +++ b/buildtools/containerfiles/ubuntu:26.10.amd64 @@ -0,0 +1,10 @@ +FROM --platform=amd64 ubuntu:26.10 as build +COPY install-build-pkgs build-mergerfs /tmp/ +RUN /tmp/install-build-pkgs +ARG BUILD_TIMESTAMP=0 +ARG GIT_REPO +ARG BRANCH +RUN /tmp/build-mergerfs $GIT_REPO $BRANCH + +FROM scratch +COPY --from=build /build/ / diff --git a/buildtools/containerfiles/ubuntu:26.10.arm64 b/buildtools/containerfiles/ubuntu:26.10.arm64 new file mode 100644 index 00000000..4f5453ec --- /dev/null +++ b/buildtools/containerfiles/ubuntu:26.10.arm64 @@ -0,0 +1,10 @@ +FROM --platform=arm64 ubuntu:26.10 as build +COPY install-build-pkgs build-mergerfs /tmp/ +RUN /tmp/install-build-pkgs +ARG BUILD_TIMESTAMP=0 +ARG GIT_REPO +ARG BRANCH +RUN /tmp/build-mergerfs $GIT_REPO $BRANCH + +FROM scratch +COPY --from=build /build/ / diff --git a/buildtools/containerfiles/ubuntu:26.10.armhf b/buildtools/containerfiles/ubuntu:26.10.armhf new file mode 100644 index 00000000..97e6efdb --- /dev/null +++ b/buildtools/containerfiles/ubuntu:26.10.armhf @@ -0,0 +1,10 @@ +FROM --platform=armhf ubuntu:26.10 as build +COPY install-build-pkgs build-mergerfs /tmp/ +RUN /tmp/install-build-pkgs +ARG BUILD_TIMESTAMP=0 +ARG GIT_REPO +ARG BRANCH +RUN /tmp/build-mergerfs $GIT_REPO $BRANCH + +FROM scratch +COPY --from=build /build/ / diff --git a/buildtools/containerfiles/ubuntu:26.10.riscv64 b/buildtools/containerfiles/ubuntu:26.10.riscv64 new file mode 100644 index 00000000..52e03864 --- /dev/null +++ b/buildtools/containerfiles/ubuntu:26.10.riscv64 @@ -0,0 +1,10 @@ +FROM --platform=riscv64 ubuntu:26.10 as build +COPY install-build-pkgs build-mergerfs /tmp/ +RUN /tmp/install-build-pkgs +ARG BUILD_TIMESTAMP=0 +ARG GIT_REPO +ARG BRANCH +RUN /tmp/build-mergerfs $GIT_REPO $BRANCH + +FROM scratch +COPY --from=build /build/ / diff --git a/buildtools/target-containers.txt b/buildtools/target-containers.txt index f6f78928..6a987370 100644 --- a/buildtools/target-containers.txt +++ b/buildtools/target-containers.txt @@ -19,6 +19,10 @@ fedora:42 amd64 fedora:42 arm64 fedora:43 amd64 fedora:43 arm64 +fedora:44 amd64 +fedora:44 arm64 +fedora:45 amd64 +fedora:45 arm64 quay.io/rockylinux/rockylinux:10 amd64 quay.io/rockylinux/rockylinux:10 arm64 quay.io/rockylinux/rockylinux:8 amd64 @@ -37,3 +41,15 @@ ubuntu:25.04 amd64 ubuntu:25.04 arm64 ubuntu:25.04 armhf ubuntu:25.04 riscv64 +ubuntu:25.10 amd64 +ubuntu:25.10 arm64 +ubuntu:25.10 armhf +ubuntu:25.10 riscv64 +ubuntu:26.04 amd64 +ubuntu:26.04 arm64 +ubuntu:26.04 armhf +ubuntu:26.04 riscv64 +ubuntu:26.10 amd64 +ubuntu:26.10 arm64 +ubuntu:26.10 armhf +ubuntu:26.10 riscv64 diff --git a/mkdocs/docs/setup/build.md b/mkdocs/docs/setup/build.md index 232e930a..994a71bc 100644 --- a/mkdocs/docs/setup/build.md +++ b/mkdocs/docs/setup/build.md @@ -33,6 +33,18 @@ $ su - # rpm -i rpmbuild/RPMS//mergerfs-..rpm ``` +Fedora 45 rejects unsigned RPMs by default. When installing a locally +built RPM that you trust, pass `--nosignature` to `rpm` to allow that +unsigned package. + +## Container packages + +Package build targets are defined in `buildtools/containerfiles/`, with +the standard distro targets listed in `buildtools/target-containers.txt`. +These include Fedora 45 on `amd64` and `arm64`, and Ubuntu 26.10 on +`amd64`, `arm64`, `armhf`, and `riscv64`. Foreign-architecture builds +require QEMU/binfmt support. + ## Generic Linux Have git, g++ or clang, make, python installed. diff --git a/mkdocs/docs/setup/installation.md b/mkdocs/docs/setup/installation.md index 6b59a6e3..4b1a67f1 100644 --- a/mkdocs/docs/setup/installation.md +++ b/mkdocs/docs/setup/installation.md @@ -44,11 +44,11 @@ sudo dpkg -i mergerfs_.debian-_.deb #### Ubuntu -Given non-LTS releases are rarely used for servers and only have [9 -months of support](https://ubuntu.com/about/release-cycle) we do not -build packages for them by default. It is recommended that you first -try the `deb` file for the LTS release most closely related to your -non-LTS release. If that does not work you can use the [static +Package build targets include selected Ubuntu LTS and interim releases. +Check the [release assets](https://github.com/trapexit/mergerfs/releases) +for your Ubuntu version and architecture. If no matching package is +available, try the `deb` file for the LTS release most closely related +to your non-LTS release. If that does not work you can use the [static build](#static-linux-binaries) or [file a ticket](https://github.com/trapexit/mergerfs/issues) requesting a package built.