Fix release builds and drop Debian 11 targets

Enable parallel Debian package builds through debhelper, remove Debian 11 release targets, and select the installed GCC Toolset activation script on Rocky Linux 10 while preserving older layouts. Update the build documentation.
This commit is contained in:
Antonio SJ Musumeci 2026-11-05 14:14:03 -06:00 • committed by trapexit
parent 74eade91f5
commit bdfbedad8b
8 changed files with 22 additions and 49 deletions

View file

@ -1,10 +0,0 @@
FROM --platform=amd64 debian:11 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/ /

View file

@ -1,10 +0,0 @@
FROM --platform=arm64 debian:11 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/ /

View file

@ -1,10 +0,0 @@
FROM --platform=armhf debian:11 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/ /

View file

@ -1,10 +0,0 @@
FROM --platform=i386 debian:11 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/ /

View file

@ -113,7 +113,11 @@ elif [ -e /usr/bin/dnf ]; then
dnf -y install \
"gcc-toolset-${toolset}-gcc" \
"gcc-toolset-${toolset}-gcc-c++"
write_toolset_env "/opt/rh/gcc-toolset-${toolset}/enable"
if [ -f "/usr/lib/gcc-toolset/${toolset}-env.source" ]; then
write_toolset_env "/usr/lib/gcc-toolset/${toolset}-env.source"
else
write_toolset_env "/opt/rh/gcc-toolset-${toolset}/enable"
fi
else
write_gcc_env gcc g++
fi

View file

@ -1,7 +1,3 @@
debian:11 amd64
debian:11 arm64
debian:11 armhf
debian:11 i386
debian:12 amd64
debian:12 arm64
debian:12 armhf

2
debian/rules vendored
View file

@ -7,7 +7,7 @@ export DH_VERBOSE=1
dh $@
override_dh_auto_build:
$(MAKE) release
dh_auto_build --parallel -- release
override_dh_auto_install:
$(MAKE) \

View file

@ -23,6 +23,13 @@ $ make deb
$ sudo dpkg -i ../mergerfs_<version>_<arch>.deb
```
Debian package compilation uses the available CPUs by default. To limit
parallelism, set `DEB_BUILD_OPTIONS`:
```
$ DEB_BUILD_OPTIONS=parallel=4 make deb
```
## RHEL / CentOS / Rocky / Fedora
```
@ -37,13 +44,19 @@ 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.
Rocky Linux container builds activate newer GCC Toolsets when available.
Both the Rocky 10 `/usr/lib/gcc-toolset/<version>-env.source` activation
script and the older `/opt/rh/gcc-toolset-<version>/enable` layout are
supported.
## 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.
Debian release builds target Debian 12 and 13. Other targets 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