Skip to content

Commit 7ec2e54

Browse files
[fix] directly talk to librefuse
We can avoid the perfuse daemon that way.
1 parent dac117b commit 7ec2e54

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ jobs:
216216
217217
# Packages
218218
sudo -E pkgin -y update
219-
sudo -E pkgin -y install git fuse perfuse python311 py311-pip
219+
sudo -E pkgin -y install git pkgconf python311 py311-pip
220220
sudo -E ln -sf /usr/pkg/bin/python3.11 /usr/pkg/bin/python3
221221
222222
# Fix PATH
@@ -227,9 +227,6 @@ jobs:
227227
sudo sysctl -w kern.sbmax=4194304
228228
sudo chmod 666 /dev/puffs
229229
230-
# avoid permissions issue for perfused trace file:
231-
sudo chmod 777 /var/run
232-
233230
# Install pip Dependencies
234231
python3 -m pip install --upgrade pip
235232
python3 -m pip install --upgrade wheel

mfusepy.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ class c_utimbuf(ctypes.Structure):
9696
_libfuse_path = (
9797
find_library('fuse4x') or find_library('osxfuse') or find_library('fuse') or find_library('fuse-t')
9898
)
99+
elif _system == 'NetBSD':
100+
_libfuse_path = find_library('refuse')
99101
elif _system == 'Windows':
100102
# pytype: disable=module-attr
101103
try:
@@ -152,7 +154,7 @@ def get_fuse_version(libfuse):
152154
f"Found library {_libfuse_path} is too old: {fuse_version_major}.{fuse_version_minor}. "
153155
"There have been several ABI breaks in each version. Libfuse < 2.6 is not supported!"
154156
)
155-
if fuse_version_major != 2 and not (fuse_version_major == 3 and _system == 'Linux'):
157+
if fuse_version_major != 2 and not (fuse_version_major == 3 and _system in ('Linux', 'NetBSD')):
156158
raise AttributeError(
157159
f"Found library {_libfuse_path} has wrong major version: {fuse_version_major}. Expected FUSE 2!"
158160
)

0 commit comments

Comments
 (0)