docs: Add Unraid migration guidance for mergerfs

- Add a top-level Migration page covering both migration directions. - Explain filesystem reuse, parity constraints, partition requirements, and unlocking encrypted Unraid disks. - Describe intact ZFS pool imports and subdirectory branch reuse, distinguishing them from cases requiring a data copy. - Add navigation and link the guide from the Unraid comparison.
docs: document mergerfs tradeoffs and web UI management
2026-10-19 16:16:48 +00:00 · 2026-10-03 16:52:25 -05:00 · 2026-10-01 20:14:52 -04:00 · 2026-09-22 14:50:47 -05:00 · 2026-09-21 13:46:38 -05:00 · 2026-09-05 16:00:43 -04:00
1156 changed files with 105877 additions and 51978 deletions
@@ -1,150 +0,0 @@
-linux_task:
-  name: "alpine:latest"
-  container:
-    image: alpine:latest
-    cpu: 4
-    memory: 4G
-  timeout_in: 15m
-  script:
-    - buildtools/install-build-pkgs
-    - make STATIC=1 LTO=1
-
-linux_task:
-  name: "alpine-arm:latest"
-  arm_container:
-    image: alpine:latest
-    cpu: 4
-    memory: 4G
-  timeout_in: 15m
-  script:
-    - buildtools/install-build-pkgs
-    - make STATIC=1 LTO=1
-
-linux_task:
-  name: "fedora:41"
-  container:
-    image: fedora:41
-    cpu: 4
-    memory: 4G
-  timeout_in: 15m
-  script:
-    - buildtools/install-build-pkgs
-    - make
-    - make rpm
-
-linux_task:
-  name: "fedora-arm:41"
-  arm_container:
-    image: fedora:41
-    cpu: 4
-    memory: 4G
-  timeout_in: 15m
-  script:
-    - buildtools/install-build-pkgs
-    - make
-    - make rpm
-
-linux_task:
-  name: "ubuntu:22.04"
-  container:
-    image: ubuntu:22.04
-    cpu: 4
-    memory: 4G
-  timeout_in: 15m
-  script:
-    - buildtools/install-build-pkgs
-    - git fetch
-    - make deb
-    - apt-get -y install fuse
-    - dpkg -i ../*.deb
-    - mergerfs -v || true
-
-linux_task:
-  name: "ubuntu:24.04"
-  container:
-    image: ubuntu:24.04
-    cpu: 4
-    memory: 4G
-  timeout_in: 15m
-  script:
-    - buildtools/install-build-pkgs
-    - git fetch
-    - make deb
-    - apt-get -y install fuse
-    - dpkg -i ../*.deb
-    - mergerfs -v || true
-
-linux_task:
-  name: "ubuntu:latest"
-  container:
-    image: ubuntu:latest
-    cpu: 4
-    memory: 4G
-  timeout_in: 15m
-  script:
-    - buildtools/install-build-pkgs
-    - git fetch
-    - make deb
-    - apt-get -y install fuse
-    - dpkg -i ../*.deb
-    - mergerfs -v || true
-
-linux_task:
-  name: "ubuntu-arm:latest"
-  arm_container:
-    image: ubuntu:latest
-    cpu: 4
-    memory: 4G
-  timeout_in: 15m
-  script:
-    - buildtools/install-build-pkgs
-    - git fetch
-    - make deb
-    - apt-get -y install fuse
-    - dpkg -i ../*.deb
-    - mergerfs -v || true
-
-linux_task:
-  name: "debian:12"
-  container:
-    image: debian:12
-    cpu: 4
-    memory: 4G
-  timeout_in: 15m
-  script:
-    - buildtools/install-build-pkgs
-    - git fetch
-    - make deb
-    - apt-get -y install fuse
-    - dpkg -i ../*.deb
-    - mergerfs -v || true
-
-linux_task:
-  name: "debian:latest"
-  container:
-    image: debian:latest
-    cpu: 4
-    memory: 4G
-  timeout_in: 15m
-  script:
-    - buildtools/install-build-pkgs
-    - git fetch
-    - make deb
-    - apt-get -y install fuse
-    - dpkg -i ../*.deb
-    - mergerfs -v || true
-
-linux_task:
-  name: "debian-arm:latest"
-  arm_container:
-    image: debian:latest
-    cpu: 4
-    memory: 4G
-  timeout_in: 15m
-  script:
-    - buildtools/install-build-pkgs
-    - git fetch
-    - make deb
-    - apt-get -y install fuse
-    - dpkg -i ../*.deb
-    - mergerfs -v || true
@@ -7,22 +7,31 @@ assignees: ''

 ---

+See also https://trapexit.github.io/mergerfs/latest/support
+
 **Describe the bug**

 A clear and concise description of the unexpected behavior.

-**Please be sure to use latest release of mergerfs to ensure the issue still exists. Not your distro's latest but the latest official release.**
+**Please be sure to use latest release of mergerfs to ensure the issue
+still exists. Not your distro's latest but the latest official
+release. Support will NOT be provided for old versions.**

-The master branch is **not** to be considered production ready. Feel free to file bug reports but do so indicating clearly that you are testing unreleased code.
+The `master` branch is **not** to be considered production ready. Feel
+free to file bug reports but do so indicating clearly that you are
+testing unreleased code.


 **To Reproduce**

-Steps to reproduce the behavior. List **all** steps to reproduce. **All** settings.
+Provide steps to reproduce the behavior. List **all** steps to
+reproduce. **All** settings. The version of all software involved.

 Please simplify the reproduction as much as possible.
- - Unless it is dependenat on multiple branches, use a single branch
- - Reproduce with standard tooling if possible (touch,truncate,rm,rmdir,ln,etc.) Having to install 3rd party software will make debugging more difficult.
+ * Unless it is dependenat on multiple branches, use a single branch
+ * Reproduce with standard tooling if possible
+   (touch,truncate,rm,rmdir,ln,etc.) Having to install 3rd party
+   software will make debugging more difficult.


 **Expected behavior**
@@ -30,19 +39,38 @@ Please simplify the reproduction as much as possible.
 A clear and concise description of the expected behavior.


+**Workarounds already tested**
+
+Please list all workarounds attempted and why they were ruled out as
+options.
+
+
 **System information:**

- - OS, kernel version: `uname -a`
- - mergerfs version: `mergerfs -V`
- - mergerfs settings
- - List of drives, filesystems, & sizes:
-   - `df -h`
-   - `lsblk -f`
- - A strace of the application having a problem:
-   - `strace -fvTtt -s 256 -o /tmp/app.strace.txt <cmd>`
-   - `strace -fvTtt -s 256 -o /tmp/app.strace.txt -p <appPID>`
- - strace of mergerfs while app tried to do it's thing:
-   - `strace -fvTtt -s 256 -p <mergerfsPID> -o /tmp/mergerfs.strace.txt`
+ * Attach output from
+   [mergerfs.collect-info](https://trapexit.github.io/mergerfs/latest/tooling/#mergerfscollect-info)
+   tool.
+ * Alternatively:
+   * OS: `lsb_release -a`
+   * kernel version: `uname -a`
+   * mergerfs version: `mergerfs --version`
+   * mergerfs settings / arguments: from fstab, systemd unit, command
+     line, OMV plugin, etc.
+   * List of drives, filesystems, & sizes:
+     * `df -h`
+     * `lsblk -o NAME,FSTYPE,FSSIZE,SIZE,MOUNTPOINTS,RM,RO,ROTA`
+   * All information about the relevant paths and files: permissions,
+     ownership, etc.
+   * All information about the application making the requests:
+     version, uid/gid
+ * Is mergerfs running within a container or used with container
+   technologies?
+ * Are the client apps using mergerfs running in a container?
+ * A strace of the application having a problem:
+   * `strace -fvTtt -s 256 -o /tmp/app.strace.txt <cmd>`
+   * `strace -fvTtt -s 256 -o /tmp/app.strace.txt -p <appPID>`
+ * strace of mergerfs while app tried to do it's thing:
+   * `strace -fvTtt -s 256 -p <mergerfsPID> -o /tmp/mergerfs.strace.txt`

 **Additional context**

@@ -1,42 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
-  schedule:
-    - cron: "7 3 * * 6"
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ python, cpp ]
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
-        with:
-          languages: ${{ matrix.language }}
-          queries: +security-and-quality
-
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
-        if: ${{ matrix.language == 'python' || matrix.language == 'cpp' }}
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
-        with:
-          category: "/language:${{ matrix.language }}"
@@ -1,49 +0,0 @@
-name: "mkdocs"
-on:
-  push:
-    branches:
-      - master
-    tags:
-      - '*'
-      
-permissions:
-  contents: write
-  
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.x'
-
-      - name: Configure Git Credentials
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-
-      - name: Install dependencies
-        working-directory: ./mkdocs      
-        run: |
-          pip install --no-cache-dir mkdocs mkdocs-material pymdown-extensions mike
-        
-      - name: Deploy docs
-        working-directory: ./mkdocs      
-        env:
-          REF_TYPE: ${{ github.ref_type }}
-          REF_NAME: ${{ github.ref_name }}
-        run: |
-          if [ "$REF_TYPE" = "tag" ]; then
-            mike deploy "$REF_NAME" "latest" --allow-empty --ignore-remote-status --update-aliases
-            mike set-default "latest"
-            git checkout gh-pages
-            git push -f origin gh-pages            
-          elif [ "$REF_TYPE" = "branch" ] && [ "$REF_NAME" = "master" ]; then
-            mike deploy "master" --ignore-remote-status --allow-empty
-            git checkout gh-pages
-            git push -f origin gh-pages
-          fi
@@ -14,12 +14,16 @@

 # build artifacts
 mergerfs
-obj/
+build/
 src/version.hpp
+VERSION

 # Debian files
 debian/files
 debian/changelog
+debian/debhelper-build-stamp
+debian/mergerfs.debhelper.log
+debian/mergerfs.substvars

 # RPM files
 rpmbuild/
@@ -4,8 +4,14 @@

 * libfuse: https://github.com/libfuse/libfuse (heavily modified fork of v2.x)
 * rapidhash: https://github.com/Nicoshev/rapidhash
-* ghc::filesystem: https://github.com/gulrak/filesystem
-* nonstd::optional: https://github.com/martinmoene/optional-lite
 * fmt: https://github.com/fmtlib/fmt
 * concurrentqueue: https://github.com/cameron314/concurrentqueue
 * scope_guard: https://github.com/Neargye/scope_guard
+* subprocess: https://github.com/arun11299/cpp-subprocess
+* CLI11: https://github.com/CLIUtils/CLI11
+* string-lite: https://github.com/martinmoene/string-lite
+* boost
+  * download boost
+  * ./bootstrap.sh
+  * ./b2 tools/bcp
+  * ./dist/bin/bcp unordered/concurrent_flat_map.hpp <target_dir>
@@ -1,7 +1,7 @@
 /*
  ISC License

-  Copyright (c) 2024, Antonio SJ Musumeci <trapexit@spawn.link>
+  Copyright (c) 2026, Antonio SJ Musumeci <trapexit@spawn.link>

  Permission to use, copy, modify, and/or distribute this software for any
  purpose with or without fee is hereby granted, provided that the above
@@ -1,4 +1,4 @@
-#  Copyright (c) 2024, Antonio SJ Musumeci <trapexit@spawn.link>
+#  Copyright (c) 2025, Antonio SJ Musumeci <trapexit@spawn.link>
 #
 #  Permission to use, copy, modify, and/or distribute this software for any
 #  purpose with or without fee is hereby granted, provided that the above
@@ -12,195 +12,279 @@
 #  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 #  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-GIT 	  = git
-TAR 	  = tar
-MKDIR     = mkdir
-TOUCH 	  = touch
-CP        = cp
-RM 	  = rm
-LN        = ln
-FIND 	  = find
-INSTALL   = install
-MKTEMP    = mktemp
-STRIP     = strip
-SED       = sed
-GIT2DEBCL = ./buildtools/git2debcl
-PKGCONFIG = pkg-config
+$(info mergerfs MAKEFLAGS: $(MAKEFLAGS))

-GIT_REPO = 0
+ifeq ($(shell id -u),0)
+FAKEROOT ?=
+endif
+
+CP        ?= cp
+FAKEROOT  ?= fakeroot
+FIND 	  ?= find
+GIT 	  ?= git
+GIT2DEBCL ?= buildtools/git2debcl
+INSTALL   ?= install
+LN        ?= ln
+MKDIR     ?= mkdir
+MKTEMP    ?= mktemp
+MV        ?= mv
+RM 	  ?= rm
+RPMBUILD  ?= rpmbuild
+RPMBUILD_FLAGS ?=
+SED       ?= sed
+STRIP     ?= strip
+TAR 	  ?= tar
+TOUCH 	  ?= touch
+
+BUILDDIR := build
+GITHUB_REPO ?= "https://github.com/trapexit/mergerfs"
+
+DEFAULT_TARGET := debian:13.amd64
+
+ifndef GIT_REPO
 ifneq ($(shell $(GIT) --version 2> /dev/null),)
 ifeq  ($(shell test -e .git; echo $$?),0)
 GIT_REPO = 1
 endif
 endif
-
-USE_XATTR = 1
-UGID_USE_RWLOCK = 0
-
-ifeq ($(NDEBUG),1)
-OPT_FLAGS := -O2 -DNDEBUG
-else
-OPT_FLAGS := -O0 -DDEBUG -g -fsanitize=undefined
 endif

-ifeq ($(STATIC),1)
+USE_XATTR ?= 1
+
+ifdef SANITIZE
+ifeq ($(SANITIZE),1)
+  override SANITIZE := -fsanitize=address,undefined,leak
+else ifeq ($(filter -fsanitize=%,$(SANITIZE)),)
+  override SANITIZE := -fsanitize=$(SANITIZE)
+endif
+endif
+
+COMMON_OPT_FLAGS += \
+    -fstack-protector-strong \
+    -Wextra \
+    -Wno-unused-parameter
+
+DEBUG_OPT_FLAGS += \
+    -O0 \
+    -g3 \
+    -fno-omit-frame-pointer \
+    $(SANITIZE)
+
+ifdef RELEASE
+OPT_FLAGS := -O3 $(COMMON_OPT_FLAGS)
+else
+OPT_FLAGS ?= $(DEBUG_OPT_FLAGS) $(COMMON_OPT_FLAGS)
+endif
+
+ifdef STATIC
 STATIC_FLAGS := -static
 else
 STATIC_FLAGS :=
 endif

-ifeq ($(LTO),1)
+ifdef LTO
 LTO_FLAGS := -flto
 else
 LTO_FLAGS :=
 endif

-SRC	    = $(wildcard src/*.cpp)
-OBJS        = $(SRC:src/%.cpp=build/.src/%.o)
-DEPS        = $(SRC:src/%.cpp=build/.src/%.d)
+SRC  := $(wildcard src/*.cpp)
+OBJS := $(SRC:src/%.cpp=build/.objs/%.cpp.o)
+DEPS := $(SRC:src/%.cpp=build/.objs/%.cpp.d)

-TESTS       = $(wildcard tests/*.cpp)
-TESTS_OBJS  = $(filter-out build/.src/mergerfs.o,$(OBJS))
-TESTS_OBJS += $(TESTS:tests/%.cpp=build/.tests/%.o)
-TESTS_DEPS  = $(TESTS:tests/%.cpp=build/.tests/%.d)
+TESTS      := $(wildcard tests/*.cpp)
+TESTS_OBJS := $(filter-out build/.objs/mergerfs.cpp.o,$(OBJS))
+TESTS_OBJS += $(TESTS:tests/%.cpp=build/.test_objs/%.cpp.o)
+TESTS_DEPS := $(TESTS:tests/%.cpp=build/.test_objs/%.cpp.d)
 TESTS_DEPS += $(DEPS)

-MANPAGE     = mergerfs.1
-CFLAGS      ?= ${OPT_FLAGS}
-CFLAGS      := ${CFLAGS} \
-               -Wall \
-               -Wno-unused-result
-CXXFLAGS    ?= ${OPT_FLAGS}
-CXXFLAGS    := \
-              ${CXXFLAGS} \
-              -std=c++17 \
-              $(STATIC_FLAGS) \
-              $(LTO_FLAGS) \
-              -Wall \
-              -Wno-unused-result \
-              -MMD
-FUSE_FLAGS = \
-              -Ilibfuse/include \
-              -D_FILE_OFFSET_BITS=64
-MFS_FLAGS  = \
-	      -DUSE_XATTR=$(USE_XATTR) \
-	      -DUGID_USE_RWLOCK=$(UGID_USE_RWLOCK)
-TESTS_FLAGS = \
-              -Isrc \
-              -DTESTS
+MANPAGE := mergerfs.1
+CPPFLAGS ?=
+override CPPFLAGS += \
+	-D_FILE_OFFSET_BITS=64 \
+	-DBOOST_UNORDERED_DISABLE_PARALLEL_ALGORITHMS
+CFLAGS ?= \
+	$(OPT_FLAGS) \
+	-Wall \
+	-Wno-unused-result \
+	-pipe
+override CFLAGS += \
+	-MMD \
+	-MP
+CXXFLAGS ?= \
+	$(OPT_FLAGS) \
+	$(STATIC_FLAGS) \
+	$(LTO_FLAGS) \
+	-Wall \
+	-Wpessimizing-move \
+	-Werror=pessimizing-move \
+	-Wredundant-move \
+	-Werror=redundant-move \
+	-Wno-unused-result \
+	-pipe
+override CXXFLAGS += \
+	-std=c++20 \
+	-MMD \
+	-MP
+override INC_FLAGS := \
+	-Isrc \
+	-Ivendored \
+	-Ivendored/libfuse/include
+override MFS_FLAGS  := \
+	-DUSE_XATTR=$(USE_XATTR)
+override TESTS_FLAGS := \
+	-Isrc \
+	-Ivendored \
+	-Ivendored/acutest \
+	-DTESTS

-LDFLAGS := \
-    ${LDFLAGS} \
-    -pthread \
-    -lrt
+LIBFUSE := vendored/libfuse/$(BUILDDIR)/libfuse.a
+LDFLAGS ?=
+LDLIBS := \
+	-lrt \
+	-pthread
+override LDLIBS += \
+	$(LIBFUSE)
+ifeq ($(CXX),g++)
+    GCC_VERSION := $(shell $(CXX) -dumpversion | cut -f1 -d.)
+    ifeq ($(shell test $(GCC_VERSION) -lt 9; echo $$?),0)
+        override LDLIBS += -lstdc++fs
+    endif
+endif

 # https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
-DESTDIR       =
-PREFIX        = /usr/local
-EXEC_PREFIX   = $(PREFIX)
-DATAROOTDIR   = $(PREFIX)/share
-DATADIR       = $(DATAROOTDIR)
-BINDIR        = $(EXEC_PREFIX)/bin
-SBINDIR       = $(EXEC_PREFIX)/sbin
-LIBDIR        = $(EXEC_PREFIX)/lib
-MANDIR        = $(DATAROOTDIR)/man
-MAN1DIR       = $(MANDIR)/man1
+DESTDIR       ?=
+PREFIX        ?= /usr/local
+EXEC_PREFIX   ?= $(PREFIX)
+DATAROOTDIR   ?= $(PREFIX)/share
+DATADIR       ?= $(DATAROOTDIR)
+BINDIR        ?= $(EXEC_PREFIX)/bin
+SBINDIR       ?= $(EXEC_PREFIX)/sbin
+LIBDIR        ?= $(EXEC_PREFIX)/lib
+MANDIR        ?= $(DATAROOTDIR)/man
+MAN1DIR       ?= $(MANDIR)/man1
+
+INSTALLBINDIR  ?= $(DESTDIR)$(BINDIR)
+INSTALLSBINDIR ?= $(DESTDIR)$(SBINDIR)
+INSTALLLIBDIR  ?= $(DESTDIR)$(LIBDIR)/mergerfs
+INSTALLMAN1DIR ?= $(DESTDIR)$(MAN1DIR)

-INSTALLBINDIR  = $(DESTDIR)$(BINDIR)
-INSTALLSBINDIR = $(DESTDIR)$(SBINDIR)
-INSTALLLIBDIR  = $(DESTDIR)$(LIBDIR)/mergerfs
-INSTALLMAN1DIR = $(DESTDIR)$(MAN1DIR)

 .PHONY: all
-all: mergerfs
+all: libfuse $(BUILDDIR)/mergerfs $(BUILDDIR)/fsck.mergerfs $(BUILDDIR)/mergerfs.collect-info

 .PHONY: help
 help:
-	@echo "usage: make\n"
-	@echo "make USE_XATTR=0      - build program without xattrs functionality"
-	@echo "make STATIC=1         - build static binary"
-	@echo "make LTO=1            - build with link time optimization"
+	@echo "usage: make ARG\n"
+	@echo "USE_XATTR=0     - build program without xattrs functionality"
+	@echo "STATIC=1        - build static binary"
+	@echo "LTO=1           - build with link time optimization"
+	@echo "SANITIZE=1      - build with sanitizers (address,undefined,leak)"
+	@echo "SANITIZE=list   - build with custom sanitizers (comma separated)"
+	@echo "CLEANUP=1       - cleanup images between release build process"
+	@echo "PKGDIR=/dir/    - location for release build pkgs"
+	@echo "GITREF=gitref   - gitref to use for release builds"

-objects: version build/stamp
-	$(MAKE) $(OBJS)

-tests-objects:
-	$(MAKE) $(TESTS_OBJS)
+$(BUILDDIR)/mergerfs: $(LIBFUSE) src/version.hpp $(OBJS)
+	$(CXX) $(CXXFLAGS) $(INC_FLAGS) $(MFS_FLAGS) $(CPPFLAGS) $(OBJS) -o $@ $(LDFLAGS) $(LDLIBS)

-build/mergerfs: libfuse objects
-	$(CXX) $(CXXFLAGS) $(FUSE_FLAGS) $(MFS_FLAGS) $(CPPFLAGS) $(OBJS) -o $@ libfuse/build/libfuse.a $(LDFLAGS)
+$(BUILDDIR)/fsck.mergerfs: $(BUILDDIR)/mergerfs
+	$(LN) -sf "mergerfs" $@

-build/tests: build/mergerfs tests-objects
-	$(CXX) $(CXXFLAGS) $(TESTS_FLAGS) $(FUSE_FLAGS) $(MFS_FLAGS) $(CPPFLAGS) $(TESTS_OBJS) -o $@ libfuse/build/libfuse.a $(LDFLAGS)
+$(BUILDDIR)/mergerfs.collect-info: $(BUILDDIR)/mergerfs
+	$(LN) -sf "mergerfs" $@

-mergerfs: build/mergerfs
+$(BUILDDIR)/tests: $(BUILDDIR)/mergerfs $(TESTS_OBJS)
+	$(CXX) $(CXXFLAGS) $(TESTS_FLAGS) $(INC_FLAGS) $(MFS_FLAGS) $(CPPFLAGS) $(TESTS_OBJS) -o $@ $(LDFLAGS) $(LDLIBS)

-tests: build/tests
+.PHONY: libfuse
+libfuse: $(LIBFUSE)
+	$(MAKE) -C vendored/libfuse

+$(LIBFUSE):
+	$(MAKE) -C vendored/libfuse $(BUILDDIR)/libfuse.a RELEASE=$(RELEASE)
+
+tests: $(BUILDDIR)/tests
+
+.PHONY:
 changelog:
-ifeq ($(GIT_REPO),1)
+ifdef GIT_REPO
 	$(GIT2DEBCL) --name mergerfs > ChangeLog
 else
 	@echo "WARNING: need git repo to generate ChangeLog"
 endif

 .PHONY: version
-version:
+version: src/version.hpp
+
+src/version.hpp:
 	./buildtools/update-version

-build/stamp:
-	$(MKDIR) -p build/.src build/.tests
+$(BUILDDIR)/stamp:
+	$(MKDIR) -p $(BUILDDIR)/.objs
+	$(MKDIR) -p $(BUILDDIR)/.test_objs
 	$(TOUCH) $@

-build/.src/%.o: src/%.cpp
-	$(CXX) $(CXXFLAGS) $(FUSE_FLAGS) $(MFS_FLAGS) $(CPPFLAGS) -c $< -o $@
+$(BUILDDIR)/.objs/%.cpp.o: src/%.cpp $(BUILDDIR)/stamp
+	$(CXX) $(CXXFLAGS) $(INC_FLAGS) $(MFS_FLAGS) $(CPPFLAGS) -c $< -o $@

-build/.tests/%.o: tests/%.cpp
-	$(CXX) $(CXXFLAGS) $(TESTS_FLAGS) $(FUSE_FLAGS) $(MFS_FLAGS) $(CPPFLAGS) -c $< -o $@
+$(BUILDDIR)/.test_objs/%.cpp.o: tests/%.cpp | $(BUILDDIR)/stamp
+	$(CXX) $(CXXFLAGS) $(TESTS_FLAGS) $(INC_FLAGS) $(MFS_FLAGS) $(CPPFLAGS) -c $< -o $@

-build/preload.so: build/stamp tools/preload.c
-	$(CC) -shared -fPIC $(CFLAGS) $(CPPFLAGS) -o $@ tools/preload.c
+$(BUILDDIR)/preload.so: $(BUILDDIR)/stamp tools/preload.c
+	$(CC) -shared -fPIC $(CFLAGS) -o $@ tools/preload.c

-preload: build/preload.so
+preload: $(BUILDDIR)/preload.so

 .PHONY: clean
 clean: rpm-clean
-	$(RM) -rf build
+	$(RM) -rf $(BUILDDIR)
 	$(FIND) . -name "*~" -delete
-	$(MAKE) -C libfuse clean
+	$(MAKE) -C vendored/libfuse clean

+.PHONY: distclean
 distclean: clean
-ifeq ($(GIT_REPO),1)
+ifdef GIT_REPO
 	$(GIT) clean -xfd
 endif

 .PHONY: install
 install: install-base install-mount-tools install-preload install-man

-install-base: build/mergerfs
+.PHONY: install-base
+install-base: all
 	$(MKDIR) -p "$(INSTALLBINDIR)"
-	$(INSTALL) -v -m 0755 build/mergerfs "$(INSTALLBINDIR)/mergerfs"
+	$(INSTALL) -v -m 0755 "$(BUILDDIR)/mergerfs" "$(INSTALLBINDIR)/mergerfs"
+	$(LN) -fs "mergerfs" "${INSTALLBINDIR}/fsck.mergerfs"
+	$(LN) -fs "mergerfs" "${INSTALLBINDIR}/mergerfs.collect-info"

+.PHONY: install-mount-tools
 install-mount-tools: install-base
 	$(MKDIR) -p "$(INSTALLBINDIR)"
-	$(MAKE) -C libfuse install
+	$(MAKE) -C vendored/libfuse install

+.PHONY: install-man
 install-man: man/$(MANPAGE)
 	$(MKDIR) -p "$(INSTALLMAN1DIR)"
 	$(INSTALL) -v -m 0644 "man/$(MANPAGE)" "$(INSTALLMAN1DIR)/$(MANPAGE)"

+.PHONY: install-preload
 install-preload: preload
 	$(MKDIR) -p "$(INSTALLLIBDIR)"
-	$(INSTALL) -v -m 444 "build/preload.so" "$(INSTALLLIBDIR)/preload.so"
+	$(INSTALL) -v -m 444 "$(BUILDDIR)/preload.so" "$(INSTALLLIBDIR)/preload.so"

+.PHONY: install-strip
 install-strip: install-base
 	$(STRIP) "$(INSTALLBINDIR)/mergerfs"

 .PHONY: uninstall
-uninstall: uninstall-base uninstall-mount.mergerfs uninstall-man
+uninstall: uninstall-base uninstall-mount.mergerfs uninstall-preload uninstall-man

 uninstall-base:
 	$(RM) -f "$(INSTALLBINDIR)/mergerfs"
+	$(RM) -f "$(INSTALLBINDIR)/fsck.mergerfs"
+	$(RM) -f "$(INSTALLBINDIR)/mergerfs.collect-info"

 uninstall-mount.mergerfs:
 	$(RM) -f "$(INSTALLBINDIR)/mount.mergerfs"
@@ -208,6 +292,9 @@ uninstall-mount.mergerfs:
 uninstall-man:
 	$(RM) -f "$(INSTALLMAN1DIR)/$(MANPAGE)"

+uninstall-preload:
+	$(RM) -f "$(INSTALLLIBDIR)/preload.so"
+
 .PHONY: tarball
 tarball: changelog version
 	$(eval VERSION := $(shell cat VERSION))
@@ -219,29 +306,38 @@ tarball: changelog version
 	$(TAR) --exclude=.git -cz -C $(TMPDIR) -f $(FILENAME).tar.gz $(FILENAME)
 	$(RM) -rf $(TMPDIR)

+.PHONY: debian-changelog
 debian-changelog:
-ifeq ($(GIT_REPO),1)
+ifdef GIT_REPO
 	$(GIT2DEBCL) --name mergerfs > debian/changelog
 else
-	cp ChangeLog debian/changelog
+	$(CP) -v ChangeLog debian/changelog
+	$(eval DISTRO := $(shell lsb_release -i -s | tr '[:upper:]' '[:lower:]'))
+	$(eval CODENAME := $(shell lsb_release -c -s | tr '[:upper:]' '[:lower:]'))
+	sed -i 's/~unknown-unknown/~$(DISTRO)-$(CODENAME)/g' debian/changelog
+	sed -i 's/ unknown; / $(CODENAME); /g' debian/changelog
 endif

+.PHONY: signed-deb
 signed-deb:
 	$(MAKE) distclean
 	$(MAKE) debian-changelog
-#	dpkg-source -b .
-	dpkg-buildpackage -nc
+	$(FAKEROOT) dpkg-buildpackage -nc

+.PHONY: deb
 deb:
 	$(MAKE) distclean
 	$(MAKE) debian-changelog
-#	dpkg-source -b .
-	dpkg-buildpackage -nc -uc -us
+	$(MAKE) version
+	$(FAKEROOT) dpkg-buildpackage -nc -uc -us
+	$(MKDIR) -p ./$(BUILDDIR)/pkgs/
+	$(MV) -v ../mergerfs*deb ./$(BUILDDIR)/pkgs/

 .PHONY: rpm-clean
 rpm-clean:
 	$(RM) -rf rpmbuild

+.PHONY: rpm
 rpm: tarball
 	$(eval VERSION := $(shell cat VERSION))
 	$(eval VERSION := $(subst -,_,$(VERSION)))
@@ -249,38 +345,65 @@ rpm: tarball
 	$(SED) 's/__VERSION__/$(VERSION)/g' mergerfs.spec > \
 		rpmbuild/SOURCES/mergerfs.spec
 	cp -ar mergerfs-$(VERSION).tar.gz rpmbuild/SOURCES
-	rpmbuild -ba rpmbuild/SOURCES/mergerfs.spec \
+	$(RPMBUILD) $(RPMBUILD_FLAGS) -ba rpmbuild/SOURCES/mergerfs.spec \
 		--define "_topdir $(CURDIR)/rpmbuild"

 .PHONY: install-build-pkgs
 install-build-pkgs:
 	./buildtools/install-build-pkgs

-.PHONY: libfuse
-libfuse:
-	$(MAKE) NDEBUG=$(NDEBUG) -C libfuse
+.PHONY: install-build-tools
+install-build-tools:
+	./buildtools/install-build-tools

-.PHONY: release release-amd64
+define build_release
+	$(eval GITREF ?= $(shell git describe --exact-match --tags HEAD 2>/dev/null || git symbolic-ref --short HEAD 2>/dev/null || git rev-parse --short HEAD))
+	@echo "GITREF=$(GITREF)"
+	./buildtools/build-release \
+		--target=$(1) \
+		$(if $(CLEANUP),--cleanup) \
+		$(if $(PKGDIR),--pkgdirpath=$(PKGDIR)) \
+		--git-repo=$(if $(REMOTE_REPO),$(GITHUB_REPO),".") \
+		--branch=$(GITREF)
+endef
+
+.PHONY: release release-all
+.PHONY: release-amd64 release-arm64 release-armhf release-riscv64
+.PHONY: release-sample release-static release-tarball release-installer
 release:
-	./buildtools/build-release \
-		--target=all \
-		--cleanup \
-		--branch=$(shell git branch --show-current)
+	$(MAKE) RELEASE=1 CPPFLAGS="$(CPPFLAGS) -DNDEBUG" all
+release-all:
+	$(call build_release,"all")
+release-sample:
+	$(if $(TARGET),,$(eval TARGET := $(shell ./buildtools/detect-local-target 2>/dev/null)))
+	$(call build_release,$(if $(TARGET),$(TARGET),$(DEFAULT_TARGET)))
 release-amd64:
-	./buildtools/build-release \
-		--target=amd64 \
-		--cleanup \
-		--branch=$(shell git branch --show-current)
+	$(call build_release,"amd64")
 release-arm64:
-	./buildtools/build-release \
-		--target=arm64 \
-		--cleanup \
-		--branch=$(shell git branch --show-current)
+	$(call build_release,"arm64")
+release-armhf:
+	$(call build_release,"armhf")
+release-riscv64:
+	$(call build_release,"riscv64")
 release-static:
-	./buildtools/build-release \
-		--target=static \
-		--cleanup \
-		--branch=$(shell git branch --show-current)
+	$(call build_release,"static")
+release-tarball:
+	$(call build_release,"tarball")
+release-installer:
+	$(call build_release,"installer")
+
+container:
+	$(eval GITREF ?= $(shell git describe --exact-match --tags HEAD 2>/dev/null || git symbolic-ref --short HEAD 2>/dev/null || git rev-parse --short HEAD))
+	@echo "GITREF=$(GITREF)"
+	./buildtools/build-containerimage "$(GITREF)"
+
+.PHONY: tags
+tags:
+	rm -fv TAGS
+	find . -name "*.c" -print | etags --append -
+	find . -name "*.h" -print | etags --append -
+	find . -name "*.cpp" -print | etags --append -
+	find . -name "*.hpp" -print | etags --append -


 -include $(DEPS)
@@ -4,23 +4,31 @@
 [FUSE](https://en.wikipedia.org/wiki/Filesystem_in_Userspace) based
 [union filesystem](https://en.wikipedia.org/wiki/Union_mount) geared
 towards simplifying storage and management of files across numerous
-commodity storage devices. It is similar to **mhddfs**, **unionfs**,
-and **aufs**.
+commodity storage devices. It is similar to [**mhddfs**, **unionfs**,
+**aufs**, **DrivePool**,
+etc.](https://trapexit.github.io/mergerfs/latest/project_comparisons/)
+

 ## Features

 * Logically combine numerous filesystems/paths into a single
-  mount point
+  mount point (JBOFS: Just a Bunch of FileSystems)
 * Combine paths of the same or different filesystems
 * Ability to add or remove filesystems/paths without impacting the
  rest of the data
 * Unaffected by individual filesystem failure
 * Configurable file selection and creation placement
+* File IO
+  [passthrough](https://trapexit.github.io/mergerfs/latest/config/passthrough/)
+  for near native IO performance (where supported)
 * Works with filesystems of any size
-* Works with filesystems of almost any type
+* Works with filesystems of [almost any
+  type](https://trapexit.github.io/mergerfs/latest/faq/compatibility_and_integration/#what-filesystems-can-be-used-as-branches)
 * Ignore read-only filesystems when creating files
-* Hard link copy-on-write / CoW
-* Runtime configurable
+* [Hard links](https://trapexit.github.io/mergerfs/latest/faq/technical_behavior_and_limitations/#do-hard-links-work)
+* Hard link [copy-on-write /
+  CoW](https://trapexit.github.io/mergerfs/latest/config/link_cow/)
+* [Runtime configurable](https://trapexit.github.io/mergerfs/latest/runtime_interface/)
 * Support for extended attributes (xattrs)
 * Support for file attributes (chattr)
 * Support for POSIX ACLs
@@ -30,16 +38,17 @@ and **aufs**.

 * Read/write overlay on top of read-only filesystem like OverlayFS
 * File whiteout
-* RAID like parity calculation
+* RAID like parity calculation (see [SnapRAID](https://www.snapraid.it))
 * Redundancy
 * Splitting of files across branches


 ## How it works

-mergerfs logically merges multiple filesystem paths together. It acts
-as a proxy to the underlying filesystem paths. Combining the behaviors
-of some functions and being a selector for others.
+mergerfs logically merges multiple filesystem paths together. Not
+block devices, not filesystem mounts, just paths. It acts as a proxy
+to the underlying filesystem paths. Combining the behaviors of some
+functions and being a selector for others.

 When the contents of a directory are requested mergerfs combines the
 list of files from each directory, deduplicating entries, and returns
@@ -51,8 +60,10 @@ which branch will be selected for the creation.
 For functions which change attributes or remove the file the behavior
 may be applied to all instances found.

-Read more about [policies
-here](https://trapexit.github.io/mergerfs/config/functions_categories_and_policies).
+The way in which mergerfs behaves is controlled by the
+[config/options/settings](https://trapexit.github.io/mergerfs/latest/config/options). More
+specifically by
+[policies](https://trapexit.github.io/mergerfs/latest/config/functions_categories_policies/).


 ### Visualization
@@ -63,24 +74,26 @@ A         +      B        =       C
 |                |                |
 +-- /dir1        +-- /dir1        +-- /dir1
 |   |            |   |            |   |
-|   +-- file1    |   +-- file2    |   +-- file1
-|                |   +-- file3    |   +-- file2
-+-- /dir2        |                |   +-- file3
-|   |            +-- /dir3        |
-|   +-- file4        |            +-- /dir2
-|                     +-- file5   |   |
-+-- file6                         |   +-- file4
-                                  |
-                                  +-- /dir3
-                                  |   |
-                                  |   +-- file5
-                                  |
-                                  +-- file6
+|   +-- file1    |   |            |   +-- file1
+|                |   +-- file2    |   +-- file2
+|                |   +-- file3    |   +-- file3
+|                |                |
+-- /dir2        |                +-- /dir2
+|   |            |                |   |
+|   +-- file4    |                |   +-- file4
+|                |                |
+|                +-- /dir3        +-- /dir3
+|                |   |            |   |
+|                |   +-- file5    |   +-- file5
+|                |                |
+-- file6        |                +-- file6
+-- file7        +-- file7        +-- file7
 ```

+
 ## QuickStart

-https://trapexit.github.io/mergerfs/quickstart/
+https://trapexit.github.io/mergerfs/latest/quickstart/


 ## Documentation
@@ -90,7 +103,7 @@ https://trapexit.github.io/mergerfs

 ## Support

-https://trapexit.github.io/mergerfs/support/
+https://trapexit.github.io/mergerfs/latest/support/


 ## Sponsorship and Donations
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+GIT_BRANCH="${1:-master}"
+
+set -x
+podman \
+    build \
+    --squash \
+    --no-cache \
+    --force-rm \
+    --build-arg="GIT_REPO=file:///mnt" \
+    --build-arg="BRANCH=${GIT_BRANCH}" \
+    -v "${PWD}":/mnt:ro \
+    -f "buildtools/containerimage/Containerfile" \
+    --tag "ghcr.io/trapexit/mergerfs:${GIT_BRANCH}" \
+    buildtools/
@@ -1,49 +1,76 @@
 #!/bin/sh
+set -e

-BRANCH="${1:-master}"
-SRCDIR="/tmp/mergerfs"
+if [ -e /tmp/build-env ]; then
+    . /tmp/build-env
+fi

-git clone https://github.com/trapexit/mergerfs "${SRCDIR}" -b "${BRANCH}"
+rpmbuild_flags()
+{
+    case "$(command -v "${CXX:-g++}")" in
+        /opt/rh/*)
+            printf '%s' '--undefine _annotated_build'
+            ;;
+    esac
+}

-cd "${SRCDIR}"
+if [ $# -ne 2 ]; then
+    echo "usage: $0 <branch> <git_repo>"
+    echo "argv: $@"
+    echo "argc: $#"
+    exit 1
+fi
+
+GIT_REPO="${1}"
+BRANCH="${2}"
+BUILDDIR="/tmp/build"
+
+echo "Clone source from ${GIT_REPO} to ${BUILDDIR}"
+git \
+    clone \
+    --single-branch \
+    --branch="${BRANCH}" \
+    "${GIT_REPO}" \
+    "${BUILDDIR}"
+
+cd "${BUILDDIR}"

 git log HEAD^1..

-mkdir /build
+mkdir "/build"
 if [ -e /usr/bin/apt-get ]; then
    make deb
-    if [ $? -ne 0 ]; then
-        . /etc/lsb-release
-        cp -v /etc/lsb-release "/build/${DISTRIB_ID}.${DISTRIB_CODENAME}.${DISTRIB_RELEASE}.$(arch).FAILED"
-    fi
-    find /tmp/ \
-         -type f \
-         -name "*.deb" \
-         -not -name "*dbgsym*" \
-         -exec cp -v {} /build/ \;
 elif [ -e /usr/bin/dnf ]; then
-    make rpm
-    if [ $? -ne 0 ]; then
-        . /etc/lsb-release
-        cp -v /etc/lsb-release "/build/${DISTRIB_ID}.${DISTRIB_CODENAME}.${DISTRIB_RELEASE}.$(arch).FAILED"
-    fi
-    find /tmp/ \
-         -type f \
-         -name "*.rpm" \
-         -not -name "*sym*" \
-         -not -name "*src.rpm" \
-         -exec cp -v {} /build/ \;
+    make RPMBUILD_FLAGS="$(rpmbuild_flags)" rpm
 elif [ -e /usr/bin/yum ]; then
-    . /opt/rh/devtoolset-9/enable
-    make rpm
-    find /tmp/ \
-         -type f \
-         -name "*.rpm" \
-         -not -name "*sym*" \
-         -not -name "*src.rpm" \
-         -exec cp -v {} /build/ \;
+    make RPMBUILD_FLAGS="$(rpmbuild_flags)" rpm
 elif [ -e /sbin/apk ]; then
    echo "NOT YET SUPPORTED"
+    exit 1
 elif [ -e /usr/sbin/pkg ]; then
    echo "NOT YET SUPPORTED"
+    exit 1
+elif [ -e /usr/bin/pacman ]; then
+    make tarball
+else
+    echo "NOT YET SUPPORTED"
+    exit 1
 fi
+
+echo "Copy packages to host..."
+if [ -e /usr/bin/pacman ]; then
+    find "${BUILDDIR}" \
+         -type f \
+         -name "*.tar.gz" \
+         -exec cp -v {} /build/ \;
+else
+    find "${BUILDDIR}" \
+         -type f \
+         \( -name "*.deb" -or -name "*.rpm" \) \
+         -not -name "*dbgsym*" \
+         -not -name "*sym*" \
+         -not -name "*src.rpm" \
+         -exec cp -v {} /build/ \;
+fi
+
+exit 0
@@ -7,32 +7,89 @@ import argparse
 import time


-def build(containerfile,
-          pkgdirpath,
-          branch):
+def build(git_repo,
+          branch,
+          containerfile,
+          pkgdirpath):
    timestamp = time.time_ns()
    args = ['podman',
            'build',
            '--pull=always',
-            '--force-rm',
-            '-o',pkgdirpath,
-            '-f',containerfile,
-            f'--build-arg=BRANCH={branch}',
-            f'--build-arg=BUILD_TIMESTAMP={timestamp}',
-            'buildtools/']
+            '--force-rm']
+    if os.path.exists(git_repo):
+        git_repo = os.path.realpath(git_repo)
+        args += ['-v',f'{git_repo}:/tmp/mergerfs.git:ro:z']
+        args += ['--build-arg=GIT_REPO=file:///tmp/mergerfs.git']
+    else:
+        args += [f'--build-arg=GIT_REPO={git_repo}']
+    os.makedirs(pkgdirpath,exist_ok=True)
+    args += ['-v',f'{os.path.realpath(pkgdirpath)}:/pkgs:ro']
+    args += ['-o',pkgdirpath,
+             '-f',containerfile,
+             f'--build-arg=BRANCH={branch}',
+             f'--build-arg=BUILD_TIMESTAMP={timestamp}',
+             'buildtools/']
+    # TODO: Capture output and write to log
    print(args)
-    subprocess.run(args)
+    rv = subprocess.run(args)
+    report_filepath = os.path.join(pkgdirpath,"build-report.txt")
+    with open(report_filepath,"a+") as f:
+        build = os.path.basename(containerfile)
+        f.write(build + ": ")
+        f.write(f"branch={branch}; ")
+        f.write(f"timestamp={timestamp}; ")
+        f.write("rv=")
+        if rv.returncode == 0:
+            f.write("success;")
+        else:
+            f.write("fail;")
+        f.write("\n")


 def setup():
-    args = ['sudo',
-            'apt-get',
-            'install',
-            '-fy',
-            'qemu-user-static',
-            'qemu-user-binfmt']
+    # Detect distribution
+    if os.path.exists('/usr/bin/apt-get'):
+        args = ['sudo',
+                'apt-get',
+                'install',
+                '-fy',
+                'qemu-user-static',
+                'qemu-user-binfmt']
+    elif os.path.exists('/usr/bin/pacman'):
+        args = ['sudo',
+                'pacman',
+                '-Sy',
+                '--noconfirm',
+                'qemu-user-static']
+    else:
+        print("Unsupported distribution for setup")
+        sys.exit(1)
    print(args)
    subprocess.run(args)
+    setup_binfmt()
+
+
+def setup_binfmt():
+    """Register qemu-user-static binfmt handlers (needed on Arch, etc.)."""
+    binfmt_conf = """\
+:qemu-aarch64:M::\\x7fELF\\x02\\x01\\x01\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x02\\x00\\xb7\\x00:\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xfe\\xff\\xff\\xff:/usr/bin/qemu-aarch64-static:F
+:qemu-arm:M::\\x7fELF\\x01\\x01\\x01\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x02\\x00\\x28\\x00:\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xfe\\xff\\xff\\xff:/usr/bin/qemu-arm-static:F
+:qemu-armeb:M::\\x7fELF\\x01\\x02\\x01\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x02\\x00\\x28:\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xfe\\xff\\xff:/usr/bin/qemu-armeb-static:F
+:qemu-riscv64:M::\\x7fELF\\x02\\x01\\x01\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x02\\x00\\xf3\\x00:\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xfe\\xff\\xff\\xff:/usr/bin/qemu-riscv64-static:F
+:qemu-i386:M::\\x7fELF\\x01\\x01\\x01\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x02\\x00\\x03\\x00:\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\x00\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xff\\xfe\\xff\\xff\\xff:/usr/bin/qemu-i386-static:F
+"""
+    conf_path = '/etc/binfmt.d/qemu-static.conf'
+    print(f"Writing {conf_path}")
+    try:
+        with open(conf_path, 'w') as f:
+            f.write(binfmt_conf)
+    except PermissionError:
+        print(f"Permission denied writing {conf_path}; trying with sudo...")
+        subprocess.run(['sudo', 'tee', conf_path],
+                       input=binfmt_conf.encode(), check=True)
+
+    print("Restarting systemd-binfmt...")
+    subprocess.run(['sudo', 'systemctl', 'restart', 'systemd-binfmt'])


 def podman_cleanup():
@@ -47,7 +104,7 @@ def podman_cleanup():
 def parse_args():
    p = argparse.ArgumentParser()
    p.add_argument('--target',
-                   default='debian.12.amd64')
+                   default='debian:13.amd64')
    p.add_argument('--pkgdirpath',
                   default='build/pkgs/')
    p.add_argument('--branch',
@@ -58,10 +115,19 @@ def parse_args():
    p.add_argument('--cleanup',
                   required=False,
                   action='store_true')
+    p.add_argument('--git-repo',
+                   required=False,
+                   type=str)

    return p.parse_args()


+def should_skip(filename):
+    if filename.endswith('~'):
+        return True
+    return False
+
+
 def main():
    args = parse_args()
    print(args)
@@ -70,29 +136,40 @@ def main():
        setup()
        sys.exit(0)

+    if not args.git_repo:
+        print("error: the following arguments are required: --git-repo")
+        sys.exit(1)
+
    containerfiles = []
    basepath = 'buildtools/containerfiles'
    if os.path.exists(f'{basepath}/{args.target}'):
        containerfiles.append(f'{basepath}/{args.target}')
    elif args.target == 'all':
        for root,dirnames,filenames in os.walk(basepath):
+            filenames.sort()
            for filename in filenames:
+                if should_skip(filename):
+                    continue
                containerfile = f'buildtools/containerfiles/{filename}'
                containerfiles.append(containerfile)
    else:
        for root,dirnames,filenames in os.walk(basepath):
+            filenames.sort()
            for filename in filenames:
                if args.target not in filename:
                    continue
+                if should_skip(filename):
+                    continue
                containerfile = f'buildtools/containerfiles/{filename}'
                containerfiles.append(containerfile)

    for containerfile in containerfiles:
        if args.cleanup:
            podman_cleanup()
-        build(containerfile,
-              args.pkgdirpath,
-              args.branch)
+        build(git_repo=args.git_repo,
+              branch=args.branch,
+              containerfile=containerfile,
+              pkgdirpath=args.pkgdirpath)

    sys.exit(0)

@@ -1,9 +0,0 @@
-FROM --platform=linux/amd64 debian:11 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/arm64 debian:11 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/armhf debian:11 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/i386 debian:11 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/amd64 debian:12 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/arm64 debian:12 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/armhf debian:12 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/i386 debian:12 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/amd64 debian:9 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/arm64 debian:9 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/armhf debian:9 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/i386 debian:9 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +1,10 @@
-FROM --platform=linux/amd64 debian:10 as build
+FROM --platform=amd64 debian:11 as build
 COPY install-build-pkgs build-mergerfs /tmp/
 RUN /tmp/install-build-pkgs
 ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
+ARG GIT_REPO
+ARG BRANCH
+RUN /tmp/build-mergerfs $GIT_REPO $BRANCH

 FROM scratch
 COPY --from=build /build/ /
@@ -0,0 +1,10 @@
+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/ /
@@ -0,0 +1,10 @@
+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/ /
@@ -1,9 +1,10 @@
-FROM --platform=linux/arm64 debian:10 as build
+FROM --platform=i386 debian:11 as build
 COPY install-build-pkgs build-mergerfs /tmp/
 RUN /tmp/install-build-pkgs
 ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
+ARG GIT_REPO
+ARG BRANCH
+RUN /tmp/build-mergerfs $GIT_REPO $BRANCH

 FROM scratch
 COPY --from=build /build/ /
@@ -0,0 +1,10 @@
+FROM --platform=amd64 debian:12 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/ /
@@ -0,0 +1,10 @@
+FROM --platform=arm64 debian:12 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/ /
@@ -0,0 +1,10 @@
+FROM --platform=armhf debian:12 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/ /
@@ -1,9 +1,10 @@
-FROM --platform=linux/armhf debian:10 as build
+FROM --platform=i386 debian:12 as build
 COPY install-build-pkgs build-mergerfs /tmp/
 RUN /tmp/install-build-pkgs
 ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
+ARG GIT_REPO
+ARG BRANCH
+RUN /tmp/build-mergerfs $GIT_REPO $BRANCH

 FROM scratch
 COPY --from=build /build/ /
@@ -0,0 +1,10 @@
+FROM --platform=amd64 debian:13 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/ /
@@ -0,0 +1,10 @@
+FROM --platform=arm64 debian:13 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/ /
@@ -0,0 +1,10 @@
+FROM --platform=armhf debian:13 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/ /
@@ -1,9 +1,10 @@
-FROM --platform=linux/i386 debian:10 as build
+FROM --platform=i386 debian:13 as build
 COPY install-build-pkgs build-mergerfs /tmp/
 RUN /tmp/install-build-pkgs
 ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
+ARG GIT_REPO
+ARG BRANCH
+RUN /tmp/build-mergerfs $GIT_REPO $BRANCH

 FROM scratch
 COPY --from=build /build/ /
@@ -0,0 +1,10 @@
+FROM --platform=riscv64 debian:13 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/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/amd64 fedora:37 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/arm64 fedora:37 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/armhf fedora:37 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/i386 fedora:37 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/amd64 fedora:38 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/arm64 fedora:38 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/armhf fedora:38 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/i386 fedora:38 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/amd64 fedora:39 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/amd64 fedora:40 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/amd64 fedora:41 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/amd64 fedora:42 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -0,0 +1,10 @@
+FROM --platform=amd64 fedora:40 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/ /
@@ -0,0 +1,10 @@
+FROM --platform=arm64 fedora:40 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/ /
@@ -0,0 +1,10 @@
+FROM --platform=amd64 fedora:41 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/ /
@@ -0,0 +1,10 @@
+FROM --platform=arm64 fedora:41 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/ /
@@ -0,0 +1,10 @@
+FROM --platform=amd64 fedora:42 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/ /
@@ -0,0 +1,10 @@
+FROM --platform=arm64 fedora:42 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/ /
@@ -0,0 +1,10 @@
+FROM --platform=amd64 fedora:43 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/ /
@@ -0,0 +1,10 @@
+FROM --platform=arm64 fedora:43 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/ /
@@ -0,0 +1,10 @@
+FROM --platform=amd64 fedora:44 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/ /
@@ -0,0 +1,10 @@
+FROM --platform=arm64 fedora:44 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/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/amd64 rockylinux:8 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/arm64 rockylinux:8 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/armhf rockylinux:8 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/i386 rockylinux:8 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/amd64 rockylinux:9 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/arm64 rockylinux:9 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/armhf rockylinux:9 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/i386 rockylinux:9 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -0,0 +1,10 @@
+FROM --platform=amd64 quay.io/rockylinux/rockylinux: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/ /
@@ -0,0 +1,10 @@
+FROM --platform=arm64 quay.io/rockylinux/rockylinux: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/ /
@@ -0,0 +1,10 @@
+FROM --platform=amd64 quay.io/rockylinux/rockylinux:8 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/ /
@@ -0,0 +1,10 @@
+FROM --platform=arm64 quay.io/rockylinux/rockylinux:8 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/ /
@@ -0,0 +1,10 @@
+FROM --platform=amd64 quay.io/rockylinux/rockylinux:9 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/ /
@@ -0,0 +1,10 @@
+FROM --platform=arm64 quay.io/rockylinux/rockylinux:9 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/ /
@@ -1,13 +1,15 @@
-ARG BUILD_TIMESTAMP=0
 FROM --platform=linux/amd64 alpine:latest as build
 COPY install-build-pkgs /tmp/
 RUN /tmp/install-build-pkgs
-ARG BRANCH=master
-RUN git clone https://github.com/trapexit/mergerfs /tmp/mergerfs -b "${BRANCH}"
+ARG BUILD_TIMESTAMP=0
+ARG GIT_REPO
+ARG BRANCH
+RUN git clone --single-branch --branch="${BRANCH}" ${GIT_REPO} /tmp/mergerfs 
 WORKDIR /tmp/mergerfs
 RUN make NDEBUG=1 LTO=1 STATIC=1 DESTDIR=/tmp -j$(nproc) install
 RUN mkdir /build
-RUN tar cvfz /build/mergerfs-static-linux_amd64.tar.gz --directory=/tmp usr sbin
+RUN /tmp/usr/local/bin/mergerfs --version | head -n1 | cut -c 11- | tee /tmp/version
+RUN tar cvfz /build/mergerfs-$(cat /tmp/version)-static-linux_amd64.tar.gz --directory=/tmp usr sbin

 FROM scratch
 COPY --from=build /build/ /
@@ -1,13 +1,15 @@
-ARG BUILD_TIMESTAMP=0
 FROM --platform=linux/arm64 alpine:latest as build
 COPY install-build-pkgs /tmp/
 RUN /tmp/install-build-pkgs
-ARG BRANCH=master
-RUN git clone https://github.com/trapexit/mergerfs /tmp/mergerfs -b "${BRANCH}"
+ARG BUILD_TIMESTAMP=0
+ARG GIT_REPO
+ARG BRANCH
+RUN git clone --single-branch --branch="${BRANCH}" ${GIT_REPO} /tmp/mergerfs 
 WORKDIR /tmp/mergerfs
 RUN make NDEBUG=1 LTO=1 STATIC=1 DESTDIR=/tmp -j$(nproc) install
 RUN mkdir /build
-RUN tar cvfz /build/mergerfs-static-linux_arm64.tar.gz --directory=/tmp usr sbin
+RUN /tmp/usr/local/bin/mergerfs --version | head -n1 | cut -c 11- | tee /tmp/version
+RUN tar cvfz /build/mergerfs-$(cat /tmp/version)-static-linux_arm64.tar.gz --directory=/tmp usr sbin

 FROM scratch
 COPY --from=build /build/ /
@@ -1,13 +1,15 @@
-ARG BUILD_TIMESTAMP=0
 FROM --platform=linux/armhf alpine:latest as build
 COPY install-build-pkgs /tmp/
 RUN /tmp/install-build-pkgs
-ARG BRANCH=master
-RUN git clone https://github.com/trapexit/mergerfs /tmp/mergerfs -b "${BRANCH}"
+ARG BUILD_TIMESTAMP=0
+ARG GIT_REPO
+ARG BRANCH
+RUN git clone --single-branch --branch="${BRANCH}" ${GIT_REPO} /tmp/mergerfs 
 WORKDIR /tmp/mergerfs
 RUN make NDEBUG=1 LTO=1 STATIC=1 DESTDIR=/tmp -j$(nproc) install
 RUN mkdir /build
-RUN tar cvfz /build/mergerfs-static-linux_armhf.tar.gz --directory=/tmp usr sbin
+RUN /tmp/usr/local/bin/mergerfs --version | head -n1 | cut -c 11- | tee /tmp/version
+RUN tar cvfz /build/mergerfs-$(cat /tmp/version)-static-linux_armhf.tar.gz --directory=/tmp usr sbin

 FROM scratch
 COPY --from=build /build/ /
@@ -1,13 +1,15 @@
-ARG BUILD_TIMESTAMP=0
 FROM --platform=linux/i386 alpine:latest as build
 COPY install-build-pkgs /tmp/
 RUN /tmp/install-build-pkgs
-ARG BRANCH=master
-RUN git clone https://github.com/trapexit/mergerfs /tmp/mergerfs -b "${BRANCH}"
+ARG BUILD_TIMESTAMP=0
+ARG GIT_REPO
+ARG BRANCH
+RUN git clone --single-branch --branch="${BRANCH}" ${GIT_REPO} /tmp/mergerfs 
 WORKDIR /tmp/mergerfs
 RUN make NDEBUG=1 LTO=1 STATIC=1 DESTDIR=/tmp -j$(nproc) install
 RUN mkdir /build
-RUN tar cvfz /build/mergerfs-static-linux_i386.tar.gz --directory=/tmp usr sbin
+RUN /tmp/usr/local/bin/mergerfs --version | head -n1 | cut -c 11- | tee /tmp/version
+RUN tar cvfz /build/mergerfs-$(cat /tmp/version)-static-linux_i386.tar.gz --directory=/tmp usr sbin

 FROM scratch
 COPY --from=build /build/ /
@@ -1,9 +1,13 @@
 ARG BUILD_TIMESTAMP=0
 FROM --platform=linux/amd64 ubuntu:latest as build
-RUN apt-get update && apt-get install -y makeself
+COPY install-build-pkgs /tmp/
+RUN /tmp/install-build-pkgs && \
+    DEBIAN_FRONTEND=noninteractive apt-get -qy --no-install-suggests --no-install-recommends install \
+        makeself
 RUN mkdir -p /tmp/mergerfs/
-RUN --mount=type=bind,src=pkgs,dst=/pkgs ls -lhd /pkgs
-RUN --mount=type=bind,src=pkgs,dst=/pkgs cp -v /pkg/*static*.gz /tmp/mergerfs/
+RUN ls -lhd /pkgs
+RUN cp -v /pkgs/*static*.gz /tmp/mergerfs/
+RUN mkdir -p /build
 RUN makeself /tmp/mergerfs/ /build/mergerfs-installer.run "mergerfs" echo "foo"

 FROM scratch
@@ -0,0 +1,15 @@
+FROM --platform=linux/riscv64 alpine:latest as build
+COPY install-build-pkgs /tmp/
+RUN /tmp/install-build-pkgs
+ARG BUILD_TIMESTAMP=0
+ARG GIT_REPO
+ARG BRANCH
+RUN git clone --single-branch --branch="${BRANCH}" ${GIT_REPO} /tmp/mergerfs 
+WORKDIR /tmp/mergerfs
+RUN make NDEBUG=1 LTO=1 STATIC=1 DESTDIR=/tmp -j$(nproc) install
+RUN mkdir /build
+RUN /tmp/usr/local/bin/mergerfs --version | head -n1 | cut -c 11- | tee /tmp/version
+RUN tar cvfz /build/mergerfs-$(cat /tmp/version)-static-linux_riscv64.tar.gz --directory=/tmp usr sbin
+
+FROM scratch
+COPY --from=build /build/ /
@@ -1,13 +1,17 @@
-FROM debian:buster as tarball
+FROM alpine:latest as tarball
+
 COPY install-build-pkgs /tmp/
 RUN /tmp/install-build-pkgs
+
 ARG BUILD_TIMESTAMP=0
 ARG BRANCH=master
-RUN git clone https://github.com/trapexit/mergerfs /tmp/mergerfs -b "${BRANCH}"
+ARG GIT_REPO
+
+RUN git clone --single-branch "${GIT_REPO}" /tmp/mergerfs --branch="${BRANCH}"
 RUN cd /tmp/mergerfs && make version tarball
+
 RUN mkdir /build
 RUN cp -v /tmp/mergerfs/*.tar.gz /build/

-
 FROM scratch
 COPY --from=tarball /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/amd64 ubuntu:18.04 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/arm64 ubuntu:18.04 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/armhf ubuntu:18.04 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/i386 ubuntu:18.04 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/amd64 ubuntu:20.04 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/arm64 ubuntu:20.04 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/armhf ubuntu:20.04 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/i386 ubuntu:20.04 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/amd64 ubuntu:22.04 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/arm64 ubuntu:22.04 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/armhf ubuntu:22.04 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/i386 ubuntu:22.04 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/amd64 ubuntu:24.04 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/arm64 ubuntu:24.04 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/armhf ubuntu:24.04 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -1,9 +0,0 @@
-FROM --platform=linux/i386 ubuntu:24.04 as build
-COPY install-build-pkgs build-mergerfs /tmp/
-RUN /tmp/install-build-pkgs
-ARG BUILD_TIMESTAMP=0
-ARG BRANCH=master
-RUN /tmp/build-mergerfs $BRANCH
-
-FROM scratch
-COPY --from=build /build/ /
@@ -0,0 +1,10 @@
+FROM --platform=amd64 ubuntu:22.04 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/ /
@@ -0,0 +1,10 @@
+FROM --platform=arm64 ubuntu:22.04 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/ /
@@ -0,0 +1,10 @@
+FROM --platform=armhf ubuntu:22.04 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/ /
@@ -0,0 +1,10 @@
+FROM --platform=riscv64 ubuntu:22.04 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/ /
--- a/Show More
+++ b/Show More