diff options
| author | Michael Forney <mforney@mforney.org> | 2019-03-18 13:41:47 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2019-03-19 00:52:21 -0700 |
| commit | 4e554f04953e88ec03f645001c5153461d760bc0 (patch) | |
| tree | 847df67cca191155775d353e023fb442fb2cd0d5 | |
| parent | 5a1e8ee09062969521dee5609d144ecf727805e1 (diff) | |
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.
| -rw-r--r-- | .gitmodules | 8 | ||||
| -rw-r--r-- | pkg/fuse/config.h (renamed from pkg/libfuse/config.h) | 0 | ||||
| -rw-r--r-- | pkg/fuse/gen.lua (renamed from pkg/libfuse/gen.lua) | 0 | ||||
| -rw-r--r-- | pkg/fuse/patch/0001-Fix-build-with-IGNORE_MTAB.patch (renamed from pkg/libfuse/patch/0001-Fix-build-with-IGNORE_MTAB.patch) | 0 | ||||
| m--------- | pkg/fuse/src (renamed from pkg/libfuse/src) | 0 | ||||
| -rw-r--r-- | pkg/fuse/ver (renamed from pkg/libfuse/ver) | 0 | ||||
| -rw-r--r-- | pkg/gen.lua | 2 | ||||
| -rw-r--r-- | pkg/sshfs/gen.lua | 6 |
8 files changed, 8 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules index 3cfff192..895e8f62 100644 --- a/.gitmodules +++ b/.gitmodules @@ -67,6 +67,10 @@ [submodule "pkg/fribidi/src"] path = pkg/fribidi/src url = https://github.com/fribidi/fribidi +[submodule "pkg/fuse/src"] + path = pkg/fuse/src + url = https://github.com/libfuse/libfuse + ignore = all [submodule "pkg/git/src"] path = pkg/git/src url = https://github.com/git/git @@ -100,10 +104,6 @@ [submodule "pkg/libffi/src"] path = pkg/libffi/src url = https://github.com/libffi/libffi -[submodule "pkg/libfuse/src"] - path = pkg/libfuse/src - url = https://github.com/libfuse/libfuse - ignore = all [submodule "pkg/libinput/src"] path = pkg/libinput/src url = https://github.com/michaelforney/libinput diff --git a/pkg/libfuse/config.h b/pkg/fuse/config.h index aece8f61..aece8f61 100644 --- a/pkg/libfuse/config.h +++ b/pkg/fuse/config.h diff --git a/pkg/libfuse/gen.lua b/pkg/fuse/gen.lua index 8554009a..8554009a 100644 --- a/pkg/libfuse/gen.lua +++ b/pkg/fuse/gen.lua diff --git a/pkg/libfuse/patch/0001-Fix-build-with-IGNORE_MTAB.patch b/pkg/fuse/patch/0001-Fix-build-with-IGNORE_MTAB.patch index d5fbf9c5..d5fbf9c5 100644 --- a/pkg/libfuse/patch/0001-Fix-build-with-IGNORE_MTAB.patch +++ b/pkg/fuse/patch/0001-Fix-build-with-IGNORE_MTAB.patch diff --git a/pkg/libfuse/src b/pkg/fuse/src -Subproject 3e2fcf3a630e575bc420df254525834504dc01b +Subproject 3e2fcf3a630e575bc420df254525834504dc01b diff --git a/pkg/libfuse/ver b/pkg/fuse/ver index f41e67fc..f41e67fc 100644 --- a/pkg/libfuse/ver +++ b/pkg/fuse/ver 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/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'} |