diff --git a/buildtools/containerfiles/debian:11.amd64 b/buildtools/containerfiles/debian:11.amd64 deleted file mode 100644 index befd8a58..00000000 --- a/buildtools/containerfiles/debian:11.amd64 +++ /dev/null @@ -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/ / diff --git a/buildtools/containerfiles/debian:11.arm64 b/buildtools/containerfiles/debian:11.arm64 deleted file mode 100644 index 7acaf016..00000000 --- a/buildtools/containerfiles/debian:11.arm64 +++ /dev/null @@ -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/ / diff --git a/buildtools/containerfiles/debian:11.armhf b/buildtools/containerfiles/debian:11.armhf deleted file mode 100644 index d0bfe045..00000000 --- a/buildtools/containerfiles/debian:11.armhf +++ /dev/null @@ -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/ / diff --git a/buildtools/containerfiles/debian:11.i386 b/buildtools/containerfiles/debian:11.i386 deleted file mode 100644 index e7f7b06f..00000000 --- a/buildtools/containerfiles/debian:11.i386 +++ /dev/null @@ -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/ / diff --git a/buildtools/install-build-pkgs b/buildtools/install-build-pkgs index 7751df7b..cadb38bf 100755 --- a/buildtools/install-build-pkgs +++ b/buildtools/install-build-pkgs @@ -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 diff --git a/buildtools/target-containers.txt b/buildtools/target-containers.txt index 6a987370..be2c3152 100644 --- a/buildtools/target-containers.txt +++ b/buildtools/target-containers.txt @@ -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 diff --git a/debian/rules b/debian/rules index 8924dfdc..2a5e810f 100755 --- a/debian/rules +++ b/debian/rules @@ -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) \ diff --git a/mkdocs/docs/setup/build.md b/mkdocs/docs/setup/build.md index 994a71bc..56b77a43 100644 --- a/mkdocs/docs/setup/build.md +++ b/mkdocs/docs/setup/build.md @@ -23,6 +23,13 @@ $ make deb $ sudo dpkg -i ../mergerfs__.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/-env.source` activation +script and the older `/opt/rh/gcc-toolset-/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