Commit Graph

1196 Commits

Author SHA1 Message Date
8c3462caf2 Merge pull request #505 from trapexit/depends
add fuse to debian pkg dependency
2018-09-30 23:46:18 -04:00
340f3c85c9 add fuse to debian pkg dependency 2018-09-30 23:45:46 -04:00
ff04098319 Merge pull request #504 from trapexit/disable_security.capabilities
add security_capability option
2018-09-30 23:34:07 -04:00
f8563369bc add security_capability option 2018-09-30 23:30:53 -04:00
4152769182 Merge pull request #499 from trapexit/docs
add comment regarding tar error
2018-09-06 08:28:40 -04:00
057eafef7f add comment regarding tar error 2018-09-06 08:28:21 -04:00
c7e93720ff Merge pull request #496 from trapexit/doc-updates
tweak docs, add FAQ regarding vendoring of libfuse
2018-08-20 13:40:41 -04:00
587ab62583 tweak docs, add FAQ regarding vendoring of libfuse 2018-08-20 13:40:01 -04:00
a894360402 Merge pull request #495 from ahippo/external-fuse
Option for building with system libfuse
2018-08-20 12:05:37 -04:00
756d4ff0ff Makefile: option for building with system libfuse
Add INTERNAL_FUSE variable to control linking against
bundled libfuse vs external/system libfuse.
If external libfuse is requested,
`pkg-config` is used to obtain CFLAGS/LIBS/LDFLAGS and
to check that the provided external libfuse is >= 2.9.7.

This might hopefully get mergerfs closer to inclusion into distros.

Link: https://github.com/trapexit/mergerfs/issues/431
Link: https://bugs.gentoo.org/587956#c6
2018-08-20 00:05:58 +03:00
ec6adaa376 options: move "-o threads=" help text to libfuse/
Parsing of and acting upon "-o threads" option is done in the bundled `libfuse/`,
so move the corresponding help text there too.
This make help text consistent with behavior
when building against system libfuse,
which doesn't support this option.
2018-08-19 21:04:35 +03:00
dee2c3e23b Merge pull request #494 from trapexit/hardlinks
add FAQ entry on hard links
2018-08-18 22:10:54 -04:00
fc52f89ddc add FAQ entry on hard links 2018-08-18 22:10:23 -04:00
fdbafa63ba Merge pull request #493 from ahippo/ldflags
Makefile: don't touch LDFLAGS
2018-08-13 07:18:58 -04:00
e987ff46c2 Makefile: don't touch LDFLAGS
These are more like LIBS rather than LDFLAGS.
They are used just in one place,
so simply put them inline.

Also, use LDFLAGS provided by the user during actual link.

This helps users pass their own LDFLAGS.
For example, this is important on Gentoo,
where LDFLAGS='-Wl,-O1 -Wl,--as-needed' is passed by default.
2018-08-13 06:02:29 +03:00
b1ecc58114 Merge pull request #491 from trapexit/inode_docs
add details regarding use_ino
2018-07-25 17:29:06 -04:00
39d5ab8e83 add details regarding use_ino 2018-07-25 17:28:36 -04:00
4b1f9afe1e Merge pull request #482 from trapexit/docs
change examples to use /mnt rather than /tmp
2018-05-04 08:59:27 -04:00
c005463111 change examples to use /mnt rather than /tmp 2018-05-04 09:00:27 -04:00
50384f4e86 Merge pull request #475 from trapexit/version
fix version.hpp creation, again
2.24.2
2018-03-24 06:53:35 -07:00
73e8867400 fix version.hpp creation, again 2018-03-24 09:51:25 -04:00
0545da67ff Merge pull request #474 from trapexit/version
fix versioning with tarball building
2.24.1
2018-03-16 23:27:04 -04:00
24e690b995 fix versioning with tarball building 2018-03-16 23:26:29 -04:00
89200a0ab8 Merge pull request #473 from trapexit/version
version bumps and calculation fixes
2.24.0
2018-03-09 21:14:44 -05:00
e521833cec bump change date on readme and rebuild man 2018-03-09 21:12:52 -05:00
737d941941 bump builtin libfuse version 2018-03-09 21:10:09 -05:00
9830e29945 fix version generation 2018-03-09 21:06:00 -05:00
6418b00ac3 Merge pull request #472 from trapexit/clonepathperms
ignore clonepath metadata errors. fixes #470
2018-03-08 16:56:33 -05:00
cfe9c28a10 ignore clonepath metadata errors. fixes #470 2018-03-08 16:55:35 -05:00
aa6e4c1865 Merge pull request #471 from trapexit/clonepath
stop clonepath at base directory. fixes #467
2018-03-08 16:48:53 -05:00
f48c16d162 stop clonepath at base directory. fixes #467 2018-03-07 18:46:32 -05:00
62ae871d51 Merge pull request #469 from trapexit/hard_remove
add hard_remove details and comment on unionfs
2018-03-03 13:25:15 -05:00
906702de77 add hard_remove details and comment on unionfs 2018-03-03 13:24:49 -05:00
db27a91a58 Merge pull request #461 from agsimmons/master
Remove duplicate word in README
2018-01-18 15:41:57 -05:00
b4a003c5a8 Remove duplicate word in README 2018-01-18 15:38:16 -05:00
b48054fa2c add XRP to support list 2017-12-21 09:47:53 -05:00
d8f05ac8ae add BCH, ETH, & LTC donation addresses 2017-12-20 22:11:26 -05:00
8843ace757 Merge pull request #454 from trapexit/faq
add explination in FAQ about what mergerfs is / is not
2017-11-15 16:40:24 -05:00
7d93d5917e add explination in FAQ about what mergerfs is / is not 2017-11-15 16:39:25 -05:00
8846a135bc Merge pull request #452 from trapexit/faq
faq answer on epmfs
2017-11-07 14:49:38 -05:00
7207e7fdd6 faq answer on epmfs 2017-11-07 14:48:38 -05:00
a8e6128034 Merge pull request #451 from trapexit/faq
update FAQ and misc tweaks
2017-11-07 09:00:29 -05:00
f72bb1e1ed update FAQ and misc tweaks 2017-11-07 08:59:49 -05:00
cf5d28ea4a Merge pull request #450 from trapexit/support
add support info and how mergerfs works section
2017-11-05 13:44:40 -05:00
bd14f33c31 add support info and how mergerfs works section 2017-11-05 13:43:33 -05:00
73561c1861 Merge pull request #449 from trapexit/issue-template
Create issue_template.md
2017-11-05 12:10:15 -05:00
43d50ca471 Create issue_template.md 2017-11-05 12:09:53 -05:00
8ea0b395b2 Merge pull request #445 from trapexit/setreuid
call 32bit versions of set/geteuid on 32bit platforms
2.23.1
2017-10-17 22:23:27 -04:00
1d6d22727c call 32bit versions of set/geteuid on 32bit platforms 2017-10-17 22:21:29 -04:00
b3c10f5bdf Merge pull request #435 from trapexit/man
rebuild manpage
2017-08-06 14:43:03 -04:00