diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index fe109ebe7f..a92a19210f 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -44,6 +44,9 @@ April 11th, 2017 + + [bdubbs] - Update to fuse-3.0.1. + [dj] - Added fuse-3.0.0. Fixes #8626. diff --git a/packages.ent b/packages.ent index b34fe48a6d..7da4abd277 100644 --- a/packages.ent +++ b/packages.ent @@ -45,7 +45,7 @@ - + diff --git a/postlfs/filesystems/fuse2.xml b/postlfs/filesystems/fuse2.xml index e14661a6ba..9d3466cace 100644 --- a/postlfs/filesystems/fuse2.xml +++ b/postlfs/filesystems/fuse2.xml @@ -37,6 +37,14 @@ filesystem implementations. + + This package is only installed for compatibility with + and . It is + not needed with other packages. For full fuse functionality, + install which does not interfere with + these instructions. + + &lfs80_checked; Package Information @@ -75,15 +83,15 @@ Fuse Dependencies + Optional - (to build the API documentation - not - recommended) + (to rebuild the API documentation) @@ -130,15 +138,17 @@ make DESTDIR=$PWD/Dest install Now, as the root user: -cp -v Dest/lib/*.so* /lib && -cp -v Dest/lib/*.la /usr/lib && -cp -v Dest/lib/pkgconfig/* /usr/lib/pkgconfig && +cp -v Dest/lib/*.so.* /lib && +ln -sv ../../lib/libfuse.so.2 /usr/lib/libfuse.so && +ln -sv ../../lib/libulockmgr.so.1 /usr/lib/libulockmgr.so && -cp -v Dest/bin/* /bin && - -install -vdm755 /usr/include/fuse && -cp -v Dest/usr/include/*.h /usr/include && -cp -v Dest/usr/include/fuse/*.h /usr/include/fuse/ && +cp -v Dest/lib/pkgconfig/* /usr/lib/pkgconfig && + +cp -v Dest/bin/* /bin && + +install -vdm755 /usr/include/fuse && +cp -v Dest/usr/include/*.h /usr/include && +cp -v Dest/usr/include/fuse/*.h /usr/include/fuse/ && cp -v Dest/usr/share/man/man1/* /usr/share/man/man1 @@ -190,7 +200,7 @@ cp -v Dest/usr/share/man/man1/* /usr/share/man/man1 - fusermount, mount.fuse, and ulockmgr_server + fusermount and ulockmgr_server libfuse.so and libulockmgr.so @@ -219,19 +229,6 @@ cp -v Dest/usr/share/man/man1/* /usr/share/man/man1 - - mount.fuse - - - is the command mount would call to mount a Fuse - filesystem. - - - mount.fuse - - - - ulockmgr_server diff --git a/postlfs/filesystems/fuse3.xml b/postlfs/filesystems/fuse3.xml index 08c3ec1af8..2170acce38 100644 --- a/postlfs/filesystems/fuse3.xml +++ b/postlfs/filesystems/fuse3.xml @@ -4,12 +4,12 @@ %general-entities; - + - - + + - + ]> @@ -73,15 +73,12 @@ - - + User Notes: @@ -114,13 +111,15 @@ ./configure --prefix=/usr \ --disable-static \ --exec-prefix=/ \ + --with-pkgconfigdir=/usr/lib/pkgconfig \ INIT_D_PATH=/tmp/init.d && make - + + The API documentation is included in the package, but + if you have installed and wish to rebuild + it, issue doxygen doc/Doxyfile. + This package does not come with a test suite. @@ -130,25 +129,17 @@ make Now, as the root user: -make install && +make install && +rm -v /lib/libfuse3.{so,la} && +ln -sfv ../../lib/libfuse3.so.3 /usr/lib/libfuse3.so && rm -rf /tmp/init.d && + install -v -m755 -d /usr/share/doc/fuse-&fuse3-version; && install -v -m644 doc/{README.NFS,kernel.txt} \ /usr/share/doc/fuse-&fuse3-version; && cp -Rv doc/html /usr/share/doc/fuse-&fuse3-version; -