Attachment #765652 for bug #833890

View | Details | Raw Unified | Return to bug 833890
Collapse All | Expand All

Lines 194-200 Link Here

(-)grub-2.04/Makefile.util.def (-2 / +2 lines)
194	common = util/config.c;	194	common = util/config.c;
195		195
196	extra_dist = util/grub-mkimagexx.c;	196	extra_dist = util/grub-mkimagexx.c;
197		197	cppflags = '-I/usr/include/fuse3';
198	ldadd = libgrubmods.a;	198	ldadd = libgrubmods.a;
199	ldadd = libgrubgcry.a;	199	ldadd = libgrubgcry.a;
200	ldadd = libgrubkern.a;	200	ldadd = libgrubkern.a;
Lines 301-307 Link Here
301	ldadd = libgrubgcry.a;	301	ldadd = libgrubgcry.a;
302	ldadd = libgrubkern.a;	302	ldadd = libgrubkern.a;
303	ldadd = grub-core/lib/gnulib/libgnu.a;	303	ldadd = grub-core/lib/gnulib/libgnu.a;
304	ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse';	304	ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse3';
305	condition = COND_GRUB_MOUNT;	305	condition = COND_GRUB_MOUNT;
306	};	306	};
307		307




fi

if test x"$grub_mount_excuse" = x ; then
  AC_CHECK_LIB([fuse3], [fuse_main_real], [],
               [grub_mount_excuse="need FUSE3 library"])
fi

if test x"$grub_mount_excuse" = x ; then
  # Check for fuse headers.
  SAVED_CPPFLAGS="$CPPFLAGS"
  CPPFLAGS="$CPPFLAGS -I/usr/include/fuse3 -DFUSE_USE_VERSION=30"
  AC_CHECK_HEADERS([fuse3/fuse.h], [],
  	[grub_mount_excuse=["need FUSE3 headers"]])
  CPPFLAGS="$SAVED_CPPFLAGS"
fi





 *  You should have received a copy of the GNU General Public License
 *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 */
#define FUSE_USE_VERSION 30
#include <config.h>
#include <grub/types.h>
#include <grub/emu/misc.h>

#include <grub/command.h>
#include <grub/zfs/zfs.h>
#include <grub/i18n.h>
#include <fuse3/fuse.h>

#include <stdio.h>
#include <unistd.h>

}

static int
fuse_getattr (const char *path, struct stat *st, struct fuse_file_info *fi)
{
  struct fuse_getattr_ctx ctx;
  char *pathname, *path2;

  st.st_blocks = (st.st_size + 511) >> 9;
  st.st_atime = st.st_mtime = st.st_ctime
    = info->mtimeset ? info->mtime : 0;
  ctx->fill (ctx->buf, filename, &st, 0, 0);
  return 0;
}

static int 
fuse_readdir (const char *path, void *buf,
	      fuse_fill_dir_t fill, off_t off, struct fuse_file_info *fi, enum fuse_readdir_flags fl)
{
  struct fuse_readdir_ctx ctx = {
    .path = path,

Return to bug 833890

Lines 1711-1726 Link Here

(-)grub-2.04/configure.ac (-5 / +5 lines)
1711	fi	1711	fi
1712		1712
1713	if test x"$grub_mount_excuse" = x ; then	1713	if test x"$grub_mount_excuse" = x ; then
1714	AC_CHECK_LIB([fuse], [fuse_main_real], [],	1714	AC_CHECK_LIB([fuse3], [fuse_main_real], [],
1715	[grub_mount_excuse="need FUSE library"])	1715	[grub_mount_excuse="need FUSE3 library"])
1716	fi	1716	fi
1717		1717
1718	if test x"$grub_mount_excuse" = x ; then	1718	if test x"$grub_mount_excuse" = x ; then
1719	# Check for fuse headers.	1719	# Check for fuse headers.
1720	SAVED_CPPFLAGS="$CPPFLAGS"	1720	SAVED_CPPFLAGS="$CPPFLAGS"
1721	CPPFLAGS="$CPPFLAGS -DFUSE_USE_VERSION=26"	1721	CPPFLAGS="$CPPFLAGS -I/usr/include/fuse3 -DFUSE_USE_VERSION=30"
1722	AC_CHECK_HEADERS([fuse/fuse.h], [],	1722	AC_CHECK_HEADERS([fuse3/fuse.h], [],
1723	[grub_mount_excuse=["need FUSE headers"]])	1723	[grub_mount_excuse=["need FUSE3 headers"]])
1724	CPPFLAGS="$SAVED_CPPFLAGS"	1724	CPPFLAGS="$SAVED_CPPFLAGS"
1725	fi	1725	fi
1726		1726

Lines 16-22 Link Here

(-)grub-2.04/util/grub-mount.c (-5 / +5 lines)
16	* You should have received a copy of the GNU General Public License	16	* You should have received a copy of the GNU General Public License
17	* along with GRUB. If not, see <http://www.gnu.org/licenses/>.	17	* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
18	*/	18	*/
19	#define FUSE_USE_VERSION 26	19	#define FUSE_USE_VERSION 30
20	#include <config.h>	20	#include <config.h>
21	#include <grub/types.h>	21	#include <grub/types.h>
22	#include <grub/emu/misc.h>	22	#include <grub/emu/misc.h>
Lines 34-40 Link Here
34	#include <grub/command.h>	34	#include <grub/command.h>
35	#include <grub/zfs/zfs.h>	35	#include <grub/zfs/zfs.h>
36	#include <grub/i18n.h>	36	#include <grub/i18n.h>
37	#include <fuse/fuse.h>	37	#include <fuse3/fuse.h>
38		38
39	#include <stdio.h>	39	#include <stdio.h>
40	#include <unistd.h>	40	#include <unistd.h>
Lines 147-153 Link Here
147	}	147	}
148		148
149	static int	149	static int
150	fuse_getattr (const char path, struct stat st)	150	fuse_getattr (const char path, struct stat st, struct fuse_file_info *fi)
151	{	151	{
152	struct fuse_getattr_ctx ctx;	152	struct fuse_getattr_ctx ctx;
153	char pathname, path2;	153	char pathname, path2;
Lines 330-342 Link Here
330	st.st_blocks = (st.st_size + 511) >> 9;	330	st.st_blocks = (st.st_size + 511) >> 9;
331	st.st_atime = st.st_mtime = st.st_ctime	331	st.st_atime = st.st_mtime = st.st_ctime
332	= info->mtimeset ? info->mtime : 0;	332	= info->mtimeset ? info->mtime : 0;
333	ctx->fill (ctx->buf, filename, &st, 0);	333	ctx->fill (ctx->buf, filename, &st, 0, 0);
334	return 0;	334	return 0;
335	}	335	}
336		336
337	static int	337	static int
338	fuse_readdir (const char path, void buf,	338	fuse_readdir (const char path, void buf,
339	fuse_fill_dir_t fill, off_t off, struct fuse_file_info *fi)	339	fuse_fill_dir_t fill, off_t off, struct fuse_file_info *fi, enum fuse_readdir_flags fl)
340	{	340	{
341	struct fuse_readdir_ctx ctx = {	341	struct fuse_readdir_ctx ctx = {
342	.path = path,	342	.path = path,