From c7cc4d0dc5631bade93240c4f7bbab2649dd41b5 Mon Sep 17 00:00:00 2001 From: Ralf Schulze Date: Fri, 30 May 2025 21:30:12 +0000 Subject: [PATCH 1/8] fix: Add fuse dependency for borgfs --- projects/borgbackup.org/package.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/borgbackup.org/package.yml b/projects/borgbackup.org/package.yml index d13547b216..5906a59713 100644 --- a/projects/borgbackup.org/package.yml +++ b/projects/borgbackup.org/package.yml @@ -26,7 +26,7 @@ build: script: - bkpyvenv stage {{prefix}} {{version}} - ${{prefix}}/venv/bin/pip install -r requirements.d/development.txt - - ${{prefix}}/venv/bin/pip install . + - ${{prefix}}/venv/bin/pip install .[llfuse] - bkpyvenv seal {{prefix}} borg borgfs provides: @@ -45,3 +45,5 @@ test: # note that the extract path is a full subdirectory based on the original # absolute path of the fixture file - test "# borg test fixture" = "$(cat .$FIXTURE)" + - mkdir mnt && borgfs mount test-repo mnt + - test -f mnt/test-repo/test-archive/$FIXTURE From 2506b7b758f4d0b68588ee174b678401ec0cefb7 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Fri, 30 May 2025 20:29:04 -0400 Subject: [PATCH 2/8] add fuses --- projects/borgbackup.org/package.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/borgbackup.org/package.yml b/projects/borgbackup.org/package.yml index 5906a59713..dff8e11b46 100644 --- a/projects/borgbackup.org/package.yml +++ b/projects/borgbackup.org/package.yml @@ -15,8 +15,11 @@ build: openssl.org: ^1.1 facebook.com/zstd: '*' lz4.org: '*' + darwin: + macfuse.github.io: '*' linux: savannah.nongnu.org/acl: ^2.3.1 + github.com/libfuse/libfuse: '*' env: BORG_OPENSSL_PREFIX: '{{deps.openssl.org.prefix}}' BORG_LIBLZ4_PREFIX: '{{deps.lz4.org.prefix}}' From a3c9ee85be8f0eb5cebb2e397254ffde84e90c34 Mon Sep 17 00:00:00 2001 From: Ralf Schulze Date: Sat, 31 May 2025 09:33:56 +0000 Subject: [PATCH 3/8] Use fuse3 for borgbackup.org --- projects/borgbackup.org/package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/borgbackup.org/package.yml b/projects/borgbackup.org/package.yml index dff8e11b46..a51b644e42 100644 --- a/projects/borgbackup.org/package.yml +++ b/projects/borgbackup.org/package.yml @@ -19,7 +19,7 @@ build: macfuse.github.io: '*' linux: savannah.nongnu.org/acl: ^2.3.1 - github.com/libfuse/libfuse: '*' + github.com/libfuse/libfuse: ^3 env: BORG_OPENSSL_PREFIX: '{{deps.openssl.org.prefix}}' BORG_LIBLZ4_PREFIX: '{{deps.lz4.org.prefix}}' @@ -29,7 +29,7 @@ build: script: - bkpyvenv stage {{prefix}} {{version}} - ${{prefix}}/venv/bin/pip install -r requirements.d/development.txt - - ${{prefix}}/venv/bin/pip install .[llfuse] + - ${{prefix}}/venv/bin/pip install .[pyfuse3] - bkpyvenv seal {{prefix}} borg borgfs provides: From 58cae43a79c06d0ff43acacb0c003d8354f10d9c Mon Sep 17 00:00:00 2001 From: Ralf Schulze Date: Sat, 31 May 2025 09:39:33 +0000 Subject: [PATCH 4/8] Add fuse3.pc directory to PKG_CONFIG_PATH --- projects/borgbackup.org/package.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/borgbackup.org/package.yml b/projects/borgbackup.org/package.yml index a51b644e42..4abbf97ec1 100644 --- a/projects/borgbackup.org/package.yml +++ b/projects/borgbackup.org/package.yml @@ -26,6 +26,7 @@ build: BORG_LIBZSTD_PREFIX: '{{deps.facebook.com/zstd.prefix}}' BORG_LIBXXHASH_PREFIX: '{{deps.github.com/Cyan4973/xxHash.prefix}}' BORG_LIBACL_PREFIX: '{{deps.savannah.nongnu.org/acl.prefix}}' + PKG_CONFIG_PATH: '$PKG_CONFIG_PATH:{{deps.github.com/libfuse/libfuse.prefix}}/lib64/pkgconfig' script: - bkpyvenv stage {{prefix}} {{version}} - ${{prefix}}/venv/bin/pip install -r requirements.d/development.txt From 699dc1424e18b721161c86b83fd2fc4b507334d3 Mon Sep 17 00:00:00 2001 From: Ralf Schulze Date: Sat, 31 May 2025 09:45:00 +0000 Subject: [PATCH 5/8] Add linux headers --- projects/borgbackup.org/package.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/borgbackup.org/package.yml b/projects/borgbackup.org/package.yml index 4abbf97ec1..5123fce33b 100644 --- a/projects/borgbackup.org/package.yml +++ b/projects/borgbackup.org/package.yml @@ -15,6 +15,7 @@ build: openssl.org: ^1.1 facebook.com/zstd: '*' lz4.org: '*' + kernel.org/linux-headers: ^6.1 darwin: macfuse.github.io: '*' linux: From c2951572486fe10d577f4ee631a59b116ca10745 Mon Sep 17 00:00:00 2001 From: Ralf Schulze Date: Sat, 31 May 2025 09:47:34 +0000 Subject: [PATCH 6/8] Adjust linux-header version (v5) --- projects/borgbackup.org/package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/borgbackup.org/package.yml b/projects/borgbackup.org/package.yml index 5123fce33b..3e7179ed04 100644 --- a/projects/borgbackup.org/package.yml +++ b/projects/borgbackup.org/package.yml @@ -15,7 +15,7 @@ build: openssl.org: ^1.1 facebook.com/zstd: '*' lz4.org: '*' - kernel.org/linux-headers: ^6.1 + kernel.org/linux-headers: ^5 darwin: macfuse.github.io: '*' linux: From aa75b34ae8073c25c2c17ac17088da42d3896f0f Mon Sep 17 00:00:00 2001 From: Ralf Schulze Date: Sat, 31 May 2025 09:57:32 +0000 Subject: [PATCH 7/8] Pin dependency versions as defined by build instructions --- projects/borgbackup.org/package.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/borgbackup.org/package.yml b/projects/borgbackup.org/package.yml index 3e7179ed04..54bb956250 100644 --- a/projects/borgbackup.org/package.yml +++ b/projects/borgbackup.org/package.yml @@ -7,18 +7,18 @@ versions: dependencies: pkgx.sh: ^1 - github.com/Cyan4973/xxHash: ^0.8 + github.com/Cyan4973/xxHash: ^0.8.1 build: dependencies: - python.org: ^3.10 - openssl.org: ^1.1 - facebook.com/zstd: '*' - lz4.org: '*' - kernel.org/linux-headers: ^5 + python.org: ^3.9 + openssl.org: ^1.0 + facebook.com/zstd: ^1.3.0 + lz4.org: ^1.7.0 darwin: macfuse.github.io: '*' linux: + kernel.org/linux-headers: ^5 savannah.nongnu.org/acl: ^2.3.1 github.com/libfuse/libfuse: ^3 env: From 340e12681c95379f009256609ef77b1a9b4cb815 Mon Sep 17 00:00:00 2001 From: Ralf Schulze Date: Sat, 31 May 2025 10:04:09 +0000 Subject: [PATCH 8/8] Set matching fuse dependency for darwin and linux --- projects/borgbackup.org/package.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/borgbackup.org/package.yml b/projects/borgbackup.org/package.yml index 54bb956250..258bfe9387 100644 --- a/projects/borgbackup.org/package.yml +++ b/projects/borgbackup.org/package.yml @@ -28,10 +28,14 @@ build: BORG_LIBXXHASH_PREFIX: '{{deps.github.com/Cyan4973/xxHash.prefix}}' BORG_LIBACL_PREFIX: '{{deps.savannah.nongnu.org/acl.prefix}}' PKG_CONFIG_PATH: '$PKG_CONFIG_PATH:{{deps.github.com/libfuse/libfuse.prefix}}/lib64/pkgconfig' + linux: + FUSE_PKG: pyfuse3 + darwin: + FUSE_PKG: llfuse script: - bkpyvenv stage {{prefix}} {{version}} - ${{prefix}}/venv/bin/pip install -r requirements.d/development.txt - - ${{prefix}}/venv/bin/pip install .[pyfuse3] + - ${{prefix}}/venv/bin/pip install .[$FUSE_PKG] - bkpyvenv seal {{prefix}} borg borgfs provides: