From 4e554f04953e88ec03f645001c5153461d760bc0 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Mon, 18 Mar 2019 13:41:47 -0700 Subject: Rename libfuse to fuse Although the upstream repository is called libfuse, the distributed source archives are called fuse, and this is how most other distributions name the package. --- pkg/fuse/config.h | 19 +++++++++++++ pkg/fuse/gen.lua | 22 +++++++++++++++ .../patch/0001-Fix-build-with-IGNORE_MTAB.patch | 32 ++++++++++++++++++++++ pkg/fuse/src | 1 + pkg/fuse/ver | 1 + pkg/gen.lua | 2 +- pkg/libfuse/config.h | 19 ------------- pkg/libfuse/gen.lua | 22 --------------- .../patch/0001-Fix-build-with-IGNORE_MTAB.patch | 32 ---------------------- pkg/libfuse/src | 1 - pkg/libfuse/ver | 1 - pkg/sshfs/gen.lua | 6 ++-- 12 files changed, 79 insertions(+), 79 deletions(-) create mode 100644 pkg/fuse/config.h create mode 100644 pkg/fuse/gen.lua create mode 100644 pkg/fuse/patch/0001-Fix-build-with-IGNORE_MTAB.patch create mode 160000 pkg/fuse/src create mode 100644 pkg/fuse/ver delete mode 100644 pkg/libfuse/config.h delete mode 100644 pkg/libfuse/gen.lua delete mode 100644 pkg/libfuse/patch/0001-Fix-build-with-IGNORE_MTAB.patch delete mode 160000 pkg/libfuse/src delete mode 100644 pkg/libfuse/ver (limited to 'pkg') diff --git a/pkg/fuse/config.h b/pkg/fuse/config.h new file mode 100644 index 00000000..aece8f61 --- /dev/null +++ b/pkg/fuse/config.h @@ -0,0 +1,19 @@ +#define FUSERMOUNT_DIR "/bin" +#define FUSE_CONF "/etc/fuse.conf" +#define IGNORE_MTAB + +#define HAVE_FDATASYNC +#define HAVE_FORK +#define HAVE_FSTATAT +#undef HAVE_ICONV +#define HAVE_OPENAT +#define HAVE_PIPE2 +#define HAVE_POSIX_FALLOCATE +#define HAVE_READLINKAT +#define HAVE_SETXATTR +#define HAVE_SPLICE +#define HAVE_STRUCT_STAT_ST_ATIM +#undef HAVE_STRUCT_STAT_ST_ATIMESPEC +#define HAVE_UTIMENSAT +#define HAVE_VMSPLICE +#define PACKAGE_VERSION "3.3.0" diff --git a/pkg/fuse/gen.lua b/pkg/fuse/gen.lua new file mode 100644 index 00000000..8554009a --- /dev/null +++ b/pkg/fuse/gen.lua @@ -0,0 +1,22 @@ +cflags{ + '-D FUSE_USE_VERSION=33', + '-I $dir', + '-I $srcdir/include', + '-I $srcdir/lib', +} + +cc('lib/mount_util.c') + +exe('fusermount3', {'util/fusermount.c', 'lib/mount_util.c.o'}) +file('bin/fusermount3', '4755', '$outdir/fusermount3') +man{'doc/fusermount3.1'} + +lib('libfuse.a', [[lib/( + fuse.c fuse_loop.c fuse_loop_mt.c + fuse_lowlevel.c fuse_opt.c + fuse_signals.c buffer.c cuse_lowlevel.c + helper.c modules/subdir.c + mount.c mount_util.c.o +)]]) + +fetch 'git' diff --git a/pkg/fuse/patch/0001-Fix-build-with-IGNORE_MTAB.patch b/pkg/fuse/patch/0001-Fix-build-with-IGNORE_MTAB.patch new file mode 100644 index 00000000..d5fbf9c5 --- /dev/null +++ b/pkg/fuse/patch/0001-Fix-build-with-IGNORE_MTAB.patch @@ -0,0 +1,32 @@ +From 0030a024f2dbc438a19e9410e95e02156d1c78db Mon Sep 17 00:00:00 2001 +From: Michael Forney +Date: Wed, 7 Nov 2018 14:29:38 -0800 +Subject: [PATCH] Fix build with IGNORE_MTAB + +--- + util/fusermount.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/util/fusermount.c b/util/fusermount.c +index 8eb0fdc..2d02a65 100644 +--- a/util/fusermount.c ++++ b/util/fusermount.c +@@ -208,6 +208,7 @@ static int may_unmount(const char *mnt, int quiet) + + return 0; + } ++#endif /* IGNORE_MTAB */ + + /* + * Check whether the file specified in "fusermount3 -u" is really a +@@ -395,6 +396,7 @@ static int chdir_to_parent(char *copy, const char **lastp) + return 0; + } + ++#ifndef IGNORE_MTAB + /* Check whether the kernel supports UMOUNT_NOFOLLOW flag */ + static int umount_nofollow_support(void) + { +-- +2.19.1 + diff --git a/pkg/fuse/src b/pkg/fuse/src new file mode 160000 index 00000000..3e2fcf3a --- /dev/null +++ b/pkg/fuse/src @@ -0,0 +1 @@ +Subproject commit 3e2fcf3a630e575bc420df254525834504dc01b7 diff --git a/pkg/fuse/ver b/pkg/fuse/ver new file mode 100644 index 00000000..f41e67fc --- /dev/null +++ b/pkg/fuse/ver @@ -0,0 +1 @@ +3.3.0 r0 diff --git a/pkg/gen.lua b/pkg/gen.lua index daa8119e..8561b0a8 100644 --- a/pkg/gen.lua +++ b/pkg/gen.lua @@ -23,6 +23,7 @@ subgen 'flex' subgen 'fontconfig' subgen 'freetype' subgen 'fribidi' +subgen 'fuse' subgen 'git' subgen 'hostap' subgen 'ii' @@ -35,7 +36,6 @@ subgen 'libdrm' subgen 'libevdev' subgen 'libevent' subgen 'libffi' -subgen 'libfuse' subgen 'libinput' subgen 'libjpeg-turbo' subgen 'libnl' diff --git a/pkg/libfuse/config.h b/pkg/libfuse/config.h deleted file mode 100644 index aece8f61..00000000 --- a/pkg/libfuse/config.h +++ /dev/null @@ -1,19 +0,0 @@ -#define FUSERMOUNT_DIR "/bin" -#define FUSE_CONF "/etc/fuse.conf" -#define IGNORE_MTAB - -#define HAVE_FDATASYNC -#define HAVE_FORK -#define HAVE_FSTATAT -#undef HAVE_ICONV -#define HAVE_OPENAT -#define HAVE_PIPE2 -#define HAVE_POSIX_FALLOCATE -#define HAVE_READLINKAT -#define HAVE_SETXATTR -#define HAVE_SPLICE -#define HAVE_STRUCT_STAT_ST_ATIM -#undef HAVE_STRUCT_STAT_ST_ATIMESPEC -#define HAVE_UTIMENSAT -#define HAVE_VMSPLICE -#define PACKAGE_VERSION "3.3.0" diff --git a/pkg/libfuse/gen.lua b/pkg/libfuse/gen.lua deleted file mode 100644 index 8554009a..00000000 --- a/pkg/libfuse/gen.lua +++ /dev/null @@ -1,22 +0,0 @@ -cflags{ - '-D FUSE_USE_VERSION=33', - '-I $dir', - '-I $srcdir/include', - '-I $srcdir/lib', -} - -cc('lib/mount_util.c') - -exe('fusermount3', {'util/fusermount.c', 'lib/mount_util.c.o'}) -file('bin/fusermount3', '4755', '$outdir/fusermount3') -man{'doc/fusermount3.1'} - -lib('libfuse.a', [[lib/( - fuse.c fuse_loop.c fuse_loop_mt.c - fuse_lowlevel.c fuse_opt.c - fuse_signals.c buffer.c cuse_lowlevel.c - helper.c modules/subdir.c - mount.c mount_util.c.o -)]]) - -fetch 'git' diff --git a/pkg/libfuse/patch/0001-Fix-build-with-IGNORE_MTAB.patch b/pkg/libfuse/patch/0001-Fix-build-with-IGNORE_MTAB.patch deleted file mode 100644 index d5fbf9c5..00000000 --- a/pkg/libfuse/patch/0001-Fix-build-with-IGNORE_MTAB.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0030a024f2dbc438a19e9410e95e02156d1c78db Mon Sep 17 00:00:00 2001 -From: Michael Forney -Date: Wed, 7 Nov 2018 14:29:38 -0800 -Subject: [PATCH] Fix build with IGNORE_MTAB - ---- - util/fusermount.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/util/fusermount.c b/util/fusermount.c -index 8eb0fdc..2d02a65 100644 ---- a/util/fusermount.c -+++ b/util/fusermount.c -@@ -208,6 +208,7 @@ static int may_unmount(const char *mnt, int quiet) - - return 0; - } -+#endif /* IGNORE_MTAB */ - - /* - * Check whether the file specified in "fusermount3 -u" is really a -@@ -395,6 +396,7 @@ static int chdir_to_parent(char *copy, const char **lastp) - return 0; - } - -+#ifndef IGNORE_MTAB - /* Check whether the kernel supports UMOUNT_NOFOLLOW flag */ - static int umount_nofollow_support(void) - { --- -2.19.1 - diff --git a/pkg/libfuse/src b/pkg/libfuse/src deleted file mode 160000 index 3e2fcf3a..00000000 --- a/pkg/libfuse/src +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3e2fcf3a630e575bc420df254525834504dc01b7 diff --git a/pkg/libfuse/ver b/pkg/libfuse/ver deleted file mode 100644 index f41e67fc..00000000 --- a/pkg/libfuse/ver +++ /dev/null @@ -1 +0,0 @@ -3.3.0 r0 diff --git a/pkg/sshfs/gen.lua b/pkg/sshfs/gen.lua index 214c7c63..bae81fc2 100644 --- a/pkg/sshfs/gen.lua +++ b/pkg/sshfs/gen.lua @@ -1,12 +1,12 @@ cflags{ '-D FUSE_USE_VERSION=31', '-I $dir', - '-I pkg/libfuse/src/include', + '-I pkg/fuse/src/include', } exe('sshfs', { - 'sshfs.c', 'nocache.c', '$builddir/pkg/libfuse/libfuse.a', -}, {'pkg/libfuse/fetch'}) + 'sshfs.c', 'nocache.c', '$builddir/pkg/fuse/libfuse.a', +}, {'pkg/fuse/fetch'}) file('bin/sshfs', '755', '$outdir/sshfs') man{'$dir/sshfs.1'} -- cgit v1.2.3