Skip to content

Commit 069f477

Browse files
committed
Move vfuse modules to separated directory
Move vfuse modules to separated directory so it can use a different dkms.conf
1 parent 0bb5e36 commit 069f477

25 files changed

Lines changed: 130 additions & 7 deletions

copy-from-linux-branch

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,13 @@ if [ -z "${full_version}" ]; then
2929
exit 1
3030
fi
3131

32-
mkdir -p src/${full_version}
33-
pushd src/${full_version}
34-
run_cmd cp -a "${linux}/fs/fuse/*.{c,h}" .
35-
rm -f *.mod.c
36-
37-
#enable uring by default
38-
sed -i -e 's#mostly enable_uring;#mostly enable_uring = true;#' dev_uring.c
3932

4033
# Create an "vfuse" moduel for ubuntu
4134
if [[ ${full_version} =~ "ubuntu" ]]; then
35+
mkdir -p vfuse/${full_version}
36+
pushd vfuse/${full_version}
37+
run_cmd cp -a "${linux}/fs/fuse/*.{c,h}" .
38+
rm -f *.mod.c
4239
run_cmd cp -a ${basedir}/Makefile.vfuse Makefile
4340

4441
# Rename to vfuse.h to avoid loading accidentally the system fuse.h
@@ -65,9 +62,16 @@ if [[ ${full_version} =~ "ubuntu" ]]; then
6562
# not desirable
6663
sed -i -e 's#VFUSE_SUPER_MAGIC#FUSE_SUPER_MAGIC#g' *.{c,h}
6764
else
65+
mkdir -p src/${full_version}
66+
pushd src/${full_version}
67+
run_cmd cp -a "${linux}/fs/fuse/*.{c,h}" .
68+
rm -f *.mod.c
6869
run_cmd cp -a ${basedir}/Makefile.fuse Makefile
6970
run_cmd cp -a "${linux}/include/uapi/linux/fuse.h" .
7071
sed -i -e 's#<linux\/fuse\.h>#"fuse.h"#g' *.{c,h}
7172
fi
7273

74+
#enable uring by default
75+
sed -i -e 's#mostly enable_uring;#mostly enable_uring = true;#' dev_uring.c
76+
7377
popd

0 commit comments

Comments
 (0)