View | Details | Raw Unified | Return to bug 234508 | Differences between
and this patch

Collapse All | Expand All

(-)sysutils/grub2/Makefile (-26 / +33 lines)
Lines 1-12 Link Here
1
# Created by: sem@FreeBSD.org
1
# Created by: sem@FreeBSD.org
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	grub2
4
PORTNAME=	grub
5
PORTVERSION=	2.00
5
DISTVERSIONPREFIX=	grub-
6
PORTREVISION=	14
6
DISTVERSION=	2.02-248
7
DISTVERSIONSUFFIX=	-g9223eff8f
7
CATEGORIES=	sysutils
8
CATEGORIES=	sysutils
8
MASTER_SITES=	GNU/grub
9
MASTER_SITES=	http://git.savannah.gnu.org/cgit/grub.git/snapshot/
9
DISTNAME=	grub-${PORTVERSION}
10
PKGNAMESUFFIX=	2
10
11
11
MAINTAINER=	ports@FreeBSD.org
12
MAINTAINER=	ports@FreeBSD.org
12
COMMENT=	Multiboot boot loader
13
COMMENT=	Multiboot boot loader
Lines 13-21 Link Here
13
14
14
LICENSE=	GPLv3
15
LICENSE=	GPLv3
15
16
16
DEPRECATED=	Unmaintained (more than five years), not updated (one-and-a-half years), does not build with modern compilers	# PR232961
17
EXPIRATION_DATE=2019-02-04
18
19
ONLY_FOR_ARCHS=	amd64 i386
17
ONLY_FOR_ARCHS=	amd64 i386
20
18
21
BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
19
BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
Lines 23-54 Link Here
23
		help2man:misc/help2man
21
		help2man:misc/help2man
24
RUN_DEPENDS=	gsed:textproc/gsed
22
RUN_DEPENDS=	gsed:textproc/gsed
25
23
26
USES=		autoreconf bison cpe gettext gmake tar:xz
24
USES=		autoreconf:build bison cpe gettext-runtime gmake iconv pkgconfig \
27
USE_GCC=	7	# Fails to build with GCC 8, cf. PR 232961, or clang
25
		python
26
USE_GCC=	yes
27
CPE_VENDOR=	gnu
28
28
29
SSP_UNSAFE=	yes
29
GNU_CONFIGURE=	yes
30
GNU_CONFIGURE=	yes
30
INFO=		grub grub-dev
31
MAKE_JOBS_UNSAFE=	yes
32
SSP_UNSAFE=	yes
33
31
34
CPE_PRODUCT=	grub
32
CONFIGURE_ARGS=		${CONFIGURE_ARGS_${ARCH}}
35
CPE_VENDOR=	gnu
33
CONFIGURE_ARGS_i386=	--disable-efiemu
34
CONFIGURE_ENV=		CPP="${CC} -E"
36
35
37
CONFIGURE_ARGS=	--disable-werror --localedir=${PREFIX}/share/locale
36
BINARY_ALIAS=	python=${PYTHON_CMD}
38
CONFIGURE_ENV=	CPP="${CC} -E" \
37
INFO=		grub grub-dev
39
		LEX=${LOCALBASE}/bin/flex
40
38
41
OPTIONS_DEFINE=	MKFONT FUSE
39
OPTIONS_DEFINE=	FUSE MKFONT NLS
42
OPTIONS_SUB=	yes
40
OPTIONS_SUB=	yes
41
43
MKFONT_DESC=	Build grub-mkfont (require freetype2)
42
MKFONT_DESC=	Build grub-mkfont (require freetype2)
44
FUSE_DESC=	Build grub-mount (require FUSE)
43
FUSE_DESC=	Build grub-mount (require FUSE)
45
44
45
FUSE_CONFIGURE_ENABLE=	grub-mount
46
FUSE_USES=		fuse
47
46
MKFONT_CONFIGURE_ENABLE=	grub-mkfont
48
MKFONT_CONFIGURE_ENABLE=	grub-mkfont
47
MKFONT_LIB_DEPENDS=		libfreetype.so:print/freetype2
49
MKFONT_LIB_DEPENDS=		libfreetype.so:print/freetype2
48
MKFONT_BUILD_DEPENDS=		${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
50
MKFONT_BUILD_DEPENDS=		${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
49
51
50
FUSE_CONFIGURE_ENABLE=		grub-mount
52
NLS_CONFIGURE_ENABLE=	nls
51
FUSE_LIB_DEPENDS=		libfuse.so:sysutils/fusefs-libs
53
NLS_USES=		gettext-tools
52
54
53
.include <bsd.port.pre.mk>
55
.include <bsd.port.pre.mk>
54
56
Lines 59-72 Link Here
59
.endif
61
.endif
60
62
61
post-patch:
63
post-patch:
62
	@${LN} -s ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf ${WRKSRC}
63
	@${TOUCH} -t 200001010000 ${WRKSRC}/Makefile.util.def
64
	@${REINPLACE_CMD} -e '/[^auU]sed/ s,sed,gsed,g' ${WRKSRC}/util/grub.d/*.in \
64
	@${REINPLACE_CMD} -e '/[^auU]sed/ s,sed,gsed,g' ${WRKSRC}/util/grub.d/*.in \
65
		${WRKSRC}/util/*.in ${WRKSRC}/util/i386/efi/grub-dumpdevtree \
65
		${WRKSRC}/util/*.in ${WRKSRC}/util/i386/efi/grub-dumpdevtree \
66
		${WRKSRC}/util/bash-completion.d/grub-completion.bash.in
66
		${WRKSRC}/util/bash-completion.d/grub-completion.bash.in
67
67
68
post-configure:
68
post-patch-MKFONT-on:
69
	@${LN} -sfh /usr/include/machine /usr/include/sys /usr/include/x86 \
69
# For starfield theme
70
		${WRKSRC}/grub-core
70
	@${LN} -s ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf ${WRKSRC}
71
71
72
pre-configure:
73
	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SH} autogen.sh
74
75
post-install:
76
	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/charset.alias
77
72
.include <bsd.port.post.mk>
78
.include <bsd.port.post.mk>
79
RUN_DEPENDS:=	${RUN_DEPENDS:Ngcc*}
(-)sysutils/grub2/distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (grub-2.00.tar.xz) = 784ec38e7edc32239ad75b8e66df04dc8bfb26d88681bc9f627133a6eb85c458
1
TIMESTAMP = 1550651695
2
SIZE (grub-2.00.tar.xz) = 5136412
2
SHA256 (grub-grub-2.02-248-g9223eff8f.tar.gz) = a8b36201c54190094e20bee14882eb1ba368f7f534f16af9af738403f3fc6035
3
SIZE (grub-grub-2.02-248-g9223eff8f.tar.gz) = 5823833
(-)sysutils/grub2/files/patch-Makefile.util.am (-254 lines)
Lines 1-254 Link Here
1
--- Makefile.util.am.orig
2
+++ Makefile.util.am
3
@@ -185,7 +185,7 @@ endif
4
 
5
 if COND_emu
6
 noinst_LIBRARIES += libgrubmods.a
7
-libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
8
+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
9
 nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
10
 libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
11
 libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
12
@@ -197,7 +197,7 @@ endif
13
 
14
 if COND_i386_pc
15
 noinst_LIBRARIES += libgrubmods.a
16
-libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
17
+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
18
 nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
19
 libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
20
 libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
21
@@ -209,7 +209,7 @@ endif
22
 
23
 if COND_i386_efi
24
 noinst_LIBRARIES += libgrubmods.a
25
-libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
26
+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
27
 nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
28
 libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
29
 libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
30
@@ -221,7 +221,7 @@ endif
31
 
32
 if COND_i386_qemu
33
 noinst_LIBRARIES += libgrubmods.a
34
-libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
35
+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
36
 nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
37
 libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
38
 libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
39
@@ -233,7 +233,7 @@ endif
40
 
41
 if COND_i386_coreboot
42
 noinst_LIBRARIES += libgrubmods.a
43
-libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
44
+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
45
 nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
46
 libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
47
 libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
48
@@ -245,7 +245,7 @@ endif
49
 
50
 if COND_i386_multiboot
51
 noinst_LIBRARIES += libgrubmods.a
52
-libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
53
+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
54
 nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
55
 libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
56
 libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
57
@@ -257,7 +257,7 @@ endif
58
 
59
 if COND_i386_ieee1275
60
 noinst_LIBRARIES += libgrubmods.a
61
-libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
62
+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
63
 nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
64
 libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
65
 libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
66
@@ -269,7 +269,7 @@ endif
67
 
68
 if COND_x86_64_efi
69
 noinst_LIBRARIES += libgrubmods.a
70
-libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
71
+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
72
 nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
73
 libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
74
 libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
75
@@ -281,7 +281,7 @@ endif
76
 
77
 if COND_mips_loongson
78
 noinst_LIBRARIES += libgrubmods.a
79
-libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
80
+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
81
 nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
82
 libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
83
 libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
84
@@ -293,7 +293,7 @@ endif
85
 
86
 if COND_sparc64_ieee1275
87
 noinst_LIBRARIES += libgrubmods.a
88
-libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
89
+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
90
 nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
91
 libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
92
 libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
93
@@ -305,7 +305,7 @@ endif
94
 
95
 if COND_powerpc_ieee1275
96
 noinst_LIBRARIES += libgrubmods.a
97
-libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
98
+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
99
 nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
100
 libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
101
 libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
102
@@ -317,7 +317,7 @@ endif
103
 
104
 if COND_mips_arc
105
 noinst_LIBRARIES += libgrubmods.a
106
-libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
107
+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
108
 nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
109
 libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
110
 libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
111
@@ -329,7 +329,7 @@ endif
112
 
113
 if COND_ia64_efi
114
 noinst_LIBRARIES += libgrubmods.a
115
-libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
116
+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
117
 nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
118
 libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
119
 libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
120
@@ -341,7 +341,7 @@ endif
121
 
122
 if COND_mips_qemu_mips
123
 noinst_LIBRARIES += libgrubmods.a
124
-libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
125
+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
126
 nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
127
 libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
128
 libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
129
@@ -3361,7 +3361,7 @@ CLEANFILES += grub-mount.1
130
 endif
131
 grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
132
 nodist_grub_mount_SOURCES  = grub_fstest_init.c 
133
-grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
134
+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
135
 grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
136
 grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
137
 grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
138
@@ -3386,7 +3386,7 @@ CLEANFILES += grub-mount.1
139
 endif
140
 grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
141
 nodist_grub_mount_SOURCES  = grub_fstest_init.c 
142
-grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
143
+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
144
 grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
145
 grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
146
 grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
147
@@ -3411,7 +3411,7 @@ CLEANFILES += grub-mount.1
148
 endif
149
 grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
150
 nodist_grub_mount_SOURCES  = grub_fstest_init.c 
151
-grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
152
+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
153
 grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
154
 grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
155
 grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
156
@@ -3436,7 +3436,7 @@ CLEANFILES += grub-mount.1
157
 endif
158
 grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
159
 nodist_grub_mount_SOURCES  = grub_fstest_init.c 
160
-grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
161
+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
162
 grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
163
 grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
164
 grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
165
@@ -3461,7 +3461,7 @@ CLEANFILES += grub-mount.1
166
 endif
167
 grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
168
 nodist_grub_mount_SOURCES  = grub_fstest_init.c 
169
-grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
170
+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
171
 grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
172
 grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
173
 grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
174
@@ -3486,7 +3486,7 @@ CLEANFILES += grub-mount.1
175
 endif
176
 grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
177
 nodist_grub_mount_SOURCES  = grub_fstest_init.c 
178
-grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
179
+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
180
 grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
181
 grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
182
 grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
183
@@ -3511,7 +3511,7 @@ CLEANFILES += grub-mount.1
184
 endif
185
 grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
186
 nodist_grub_mount_SOURCES  = grub_fstest_init.c 
187
-grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
188
+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
189
 grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
190
 grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
191
 grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
192
@@ -3536,7 +3536,7 @@ CLEANFILES += grub-mount.1
193
 endif
194
 grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
195
 nodist_grub_mount_SOURCES  = grub_fstest_init.c 
196
-grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
197
+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
198
 grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
199
 grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
200
 grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
201
@@ -3561,7 +3561,7 @@ CLEANFILES += grub-mount.1
202
 endif
203
 grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
204
 nodist_grub_mount_SOURCES  = grub_fstest_init.c 
205
-grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
206
+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
207
 grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
208
 grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
209
 grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
210
@@ -3586,7 +3586,7 @@ CLEANFILES += grub-mount.1
211
 endif
212
 grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
213
 nodist_grub_mount_SOURCES  = grub_fstest_init.c 
214
-grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
215
+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
216
 grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
217
 grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
218
 grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
219
@@ -3611,7 +3611,7 @@ CLEANFILES += grub-mount.1
220
 endif
221
 grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
222
 nodist_grub_mount_SOURCES  = grub_fstest_init.c 
223
-grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
224
+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
225
 grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
226
 grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
227
 grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
228
@@ -3636,7 +3636,7 @@ CLEANFILES += grub-mount.1
229
 endif
230
 grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
231
 nodist_grub_mount_SOURCES  = grub_fstest_init.c 
232
-grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
233
+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
234
 grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
235
 grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
236
 grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
237
@@ -3661,7 +3661,7 @@ CLEANFILES += grub-mount.1
238
 endif
239
 grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
240
 nodist_grub_mount_SOURCES  = grub_fstest_init.c 
241
-grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
242
+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
243
 grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
244
 grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
245
 grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
246
@@ -3686,7 +3686,7 @@ CLEANFILES += grub-mount.1
247
 endif
248
 grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
249
 nodist_grub_mount_SOURCES  = grub_fstest_init.c 
250
-grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
251
+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
252
 grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
253
 grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
254
 grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
(-)sysutils/grub2/files/patch-Makefile.util.def (-11 lines)
Lines 1-11 Link Here
1
--- Makefile.util.def.orig
2
+++ Makefile.util.def
3
@@ -266,7 +266,7 @@ program = {
4
   ldadd = libgrubgcry.a;
5
   ldadd = libgrubkern.a;
6
   ldadd = grub-core/gnulib/libgnu.a;
7
-  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse';
8
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse';
9
   condition = COND_GRUB_MOUNT;
10
 };
11
 
(-)sysutils/grub2/files/patch-build-aux_test-driver (-2 / +2 lines)
Lines 1-5 Link Here
1
--- build-aux/test-driver.o	2013-07-29 08:36:33.775875020 -0400
1
--- build-aux/test-driver.orig	2019-02-20 16:53:50 UTC
2
+++ build-aux/test-driver	2013-07-29 08:35:04.085870311 -0400
2
+++ build-aux/test-driver
3
@@ -0,0 +1,127 @@
3
@@ -0,0 +1,127 @@
4
+#! /bin/sh
4
+#! /bin/sh
5
+# test-driver - basic testsuite driver script.
5
+# test-driver - basic testsuite driver script.
(-)sysutils/grub2/files/patch-configure.ac (-35 lines)
Lines 1-35 Link Here
1
--- configure.ac.orig
2
+++ configure.ac
3
@@ -1044,19 +1044,19 @@ fi
4
 
5
 if test x"$libzfs_excuse" = x ; then
6
   # Only check for system headers if libzfs support has not been disabled.
7
-  AC_CHECK_HEADERS(libzfs.h libnvpair.h)
8
+  AC_CHECK_HEADERS(libzfs.h libnvpair.h, [], [], [typedef int boolean_t;])
9
 fi
10
 
11
 if test x"$libzfs_excuse" = x ; then
12
   AC_CHECK_LIB([zfs], [libzfs_init],
13
                [],
14
-               [libzfs_excuse="need zfs library"])
15
+               [libzfs_excuse="need zfs library"], [-lavl -lnvpair -luutil -lm])
16
 fi
17
 
18
 if test x"$libzfs_excuse" = x ; then
19
   AC_CHECK_LIB([nvpair], [nvlist_print],
20
                [],
21
-               [libzfs_excuse="need nvpair library"])
22
+               [libzfs_excuse="need nvpair library"], [-lavl -lnvpair -luutil -lm])
23
 fi
24
 
25
 if test x"$enable_libzfs" = xyes && test x"$libzfs_excuse" != x ; then
26
@@ -1069,6 +1069,9 @@ if test x"$libzfs_excuse" = x ; then
27
   AC_DEFINE([HAVE_LIBZFS], [1],
28
             [Define to 1 if you have the ZFS library.])
29
   LIBNVPAIR="-lnvpair"
30
+  if test x$host_kernel = xkfreebsd; then
31
+    LIBNVPAIR="$LIBNVPAIR -lavl -luutil -lm"
32
+  fi
33
   AC_DEFINE([HAVE_LIBNVPAIR], [1],
34
             [Define to 1 if you have the NVPAIR library.])
35
 fi
(-)sysutils/grub2/files/patch-grub-2.00-zfs-feature-flag-support (-894 lines)
Lines 1-894 Link Here
1
From
2
3
	http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.00-zfs-feature-flag-support-r1.patch
4
5
ZFS Feature Flag Support
6
7
This is a monolithic version of the following commits:
8
9
https://github.com/maxximino/grub2/commit/31a32560fd7948ae5ff5c63105d7c068de7890c8
10
https://github.com/maxximino/grub2/commit/595d76e8ca0690a963f5533689de8db54ef07e75
11
https://github.com/maxximino/grub2/commit/58344034e40218b20500fa2936eb4d7d019e1e88
12
https://github.com/maxximino/grub2/commit/f98cb078abab2c14bb0766b5a0ceb055683dab81
13
https://github.com/maxximino/grub2/commit/f12806f43a969a654dee7bb89b2e8fd5c42f0e2e
14
15
A change was made to account for d8a0feb6 from upstream. This change prevents a
16
compile time failure that is caused by a change in the callback interface used
17
by mzap_interate(). Modifications to nvlist_find_value() were reverted to
18
resolve Gentoo bug #462740. This eliminated the need for the new nvpair_type()
19
and nvpair_value() functions. They have been removed to silence a compiler
20
warning and reduce the size of the patch. Further adjustments were made to
21
silence the following warnings:
22
23
/var/tmp/portage/sys-boot/grub-2.00-r2/work/grub-2.00/grub-core/fs/zfs/zfs_lz4.c:77:5:
24
warning: "__STDC_VERSION__" is not defined [-Wundef]
25
/var/tmp/portage/sys-boot/grub-2.00-r2/work/grub-2.00/grub-core/fs/zfs/zfs.c:4079:3:
26
warning: passing argument 4 of 'mzap_iterate' from incompatible pointer type
27
[enabled by default]
28
29
The initial feature flag support patches were written by Delphix while the LZ4
30
support was written by Saso Kiselkov. The work porting this to GRUB2 was done
31
by Massimo Maggi, while the adaption to Gentoo's GRUB2 package was done by
32
Richard Yao.
33
34
diff --git a/Makefile.util.def b/Makefile.util.def
35
index b80187c..1bf3038 100644
36
--- Makefile.util.def
37
+++ Makefile.util.def
38
@@ -95,6 +95,7 @@ library = {
39
   common = grub-core/fs/zfs/zfs.c;
40
   common = grub-core/fs/zfs/zfsinfo.c;
41
   common = grub-core/fs/zfs/zfs_lzjb.c;
42
+  common = grub-core/fs/zfs/zfs_lz4.c;
43
   common = grub-core/fs/zfs/zfs_sha256.c;
44
   common = grub-core/fs/zfs/zfs_fletcher.c;
45
   common = grub-core/lib/envblk.c;
46
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
47
index 39e77a4..1550b90 100644
48
--- grub-core/Makefile.core.def
49
+++ grub-core/Makefile.core.def
50
@@ -1186,6 +1186,7 @@ module = {
51
   name = zfs;
52
   common = fs/zfs/zfs.c;
53
   common = fs/zfs/zfs_lzjb.c;
54
+  common = fs/zfs/zfs_lz4.c;
55
   common = fs/zfs/zfs_sha256.c;
56
   common = fs/zfs/zfs_fletcher.c;
57
 };
58
diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
59
index ba0554a..811e3df 100644
60
--- grub-core/fs/zfs/zfs.c
61
+++ grub-core/fs/zfs/zfs.c
62
@@ -2,6 +2,7 @@
63
  *  GRUB  --  GRand Unified Bootloader
64
  *  Copyright (C) 1999,2000,2001,2002,2003,2004,2009,2010,2011  Free Software Foundation, Inc.
65
  *  Copyright 2010  Sun Microsystems, Inc.
66
+ *  Copyright (c) 2012 by Delphix. All rights reserved.
67
  *
68
  *  GRUB is free software; you can redistribute it and/or modify
69
  *  it under the terms of the GNU General Public License as published by
70
@@ -153,11 +154,13 @@ ZAP_LEAF_ENTRY(zap_leaf_phys_t *l, int bs, int idx)
71
 
72
 
73
 /*
74
- * Decompression Entry - lzjb
75
+ * Decompression Entry - lzjb & lz4
76
  */
77
 
78
 extern grub_err_t lzjb_decompress (void *, void *, grub_size_t, grub_size_t);
79
 
80
+extern grub_err_t lz4_decompress (void *, void *, grub_size_t, grub_size_t);
81
+
82
 typedef grub_err_t zfs_decomp_func_t (void *s_start, void *d_start,
83
 				      grub_size_t s_len, grub_size_t d_len);
84
 typedef struct decomp_entry
85
@@ -263,6 +266,19 @@ grub_crypto_cipher_handle_t (*grub_zfs_load_key) (const struct grub_zfs_key *key
86
 						  grub_size_t keysize,
87
 						  grub_uint64_t salt,
88
 						  grub_uint64_t algo) = NULL;
89
+/*
90
+ * List of pool features that the grub implementation of ZFS supports for
91
+ * read. Note that features that are only required for write do not need
92
+ * to be listed here since grub opens pools in read-only mode.
93
+ */
94
+static const char *spa_feature_names[] = {
95
+	"org.illumos:lz4_compress","com.delphix:hole_birth",NULL
96
+};
97
+
98
+static int NESTED_FUNC_ATTR
99
+check_feature(const char *name, grub_uint64_t val);
100
+static int
101
+check_mos_features(dnode_phys_t *mosmdn_phys,grub_zfs_endian_t endian,struct grub_zfs_data* data );
102
 
103
 static grub_err_t 
104
 zlib_decompress (void *s, void *d,
105
@@ -322,6 +338,7 @@ static decomp_entry_t decomp_table[ZIO_COMPRESS_FUNCTIONS] = {
106
   {"gzip-8", zlib_decompress},  /* ZIO_COMPRESS_GZIP8 */
107
   {"gzip-9", zlib_decompress},  /* ZIO_COMPRESS_GZIP9 */
108
   {"zle", zle_decompress},      /* ZIO_COMPRESS_ZLE   */
109
+  {"lz4", lz4_decompress},      /* ZIO_COMPRESS_LZ4   */
110
 };
111
 
112
 static grub_err_t zio_read_data (blkptr_t * bp, grub_zfs_endian_t endian,
113
@@ -482,15 +499,11 @@ uberblock_verify (uberblock_phys_t * ub, grub_uint64_t offset,
114
 
115
   if (grub_zfs_to_cpu64 (uber->ub_magic, GRUB_ZFS_LITTLE_ENDIAN)
116
       == UBERBLOCK_MAGIC
117
-      && grub_zfs_to_cpu64 (uber->ub_version, GRUB_ZFS_LITTLE_ENDIAN) > 0 
118
-      && grub_zfs_to_cpu64 (uber->ub_version, GRUB_ZFS_LITTLE_ENDIAN)
119
-      <= SPA_VERSION)
120
-    endian = GRUB_ZFS_LITTLE_ENDIAN;
121
+      && SPA_VERSION_IS_SUPPORTED(grub_zfs_to_cpu64 (uber->ub_version, GRUB_ZFS_LITTLE_ENDIAN)))
122
+     endian = GRUB_ZFS_LITTLE_ENDIAN;
123
 
124
   if (grub_zfs_to_cpu64 (uber->ub_magic, GRUB_ZFS_BIG_ENDIAN) == UBERBLOCK_MAGIC
125
-      && grub_zfs_to_cpu64 (uber->ub_version, GRUB_ZFS_BIG_ENDIAN) > 0 
126
-      && grub_zfs_to_cpu64 (uber->ub_version, GRUB_ZFS_BIG_ENDIAN)
127
-      <= SPA_VERSION)
128
+      && SPA_VERSION_IS_SUPPORTED(grub_zfs_to_cpu64 (uber->ub_version, GRUB_ZFS_BIG_ENDIAN)))
129
     endian = GRUB_ZFS_BIG_ENDIAN;
130
 
131
   if (endian == GRUB_ZFS_UNKNOWN_ENDIAN)
132
@@ -764,6 +777,99 @@ fill_vdev_info (struct grub_zfs_data *data,
133
 }
134
 
135
 /*
136
+ * For a given XDR packed nvlist, verify the first 4 bytes and move on.
137
+ *
138
+ * An XDR packed nvlist is encoded as (comments from nvs_xdr_create) :
139
+ *
140
+ *      encoding method/host endian     (4 bytes)
141
+ *      nvl_version                     (4 bytes)
142
+ *      nvl_nvflag                      (4 bytes)
143
+ *	encoded nvpairs:
144
+ *		encoded size of the nvpair      (4 bytes)
145
+ *		decoded size of the nvpair      (4 bytes)
146
+ *		name string size                (4 bytes)
147
+ *		name string data                (sizeof(NV_ALIGN4(string))
148
+ *		data type                       (4 bytes)
149
+ *		# of elements in the nvpair     (4 bytes)
150
+ *		data
151
+ *      2 zero's for the last nvpair
152
+ *		(end of the entire list)	(8 bytes)
153
+ *
154
+ */
155
+
156
+/*
157
+ * The nvlist_next_nvpair() function returns a handle to the next nvpair in the
158
+ * list following nvpair. If nvpair is NULL, the first pair is returned. If
159
+ * nvpair is the last pair in the nvlist, NULL is returned.
160
+ */
161
+static const char *
162
+nvlist_next_nvpair(const char *nvl, const char *nvpair)
163
+{
164
+	const char *nvp;
165
+	int encode_size;
166
+	int name_len;
167
+	if (nvl == NULL)
168
+		return (NULL);
169
+
170
+	if (nvpair == NULL) {
171
+		/* skip over header, nvl_version and nvl_nvflag */
172
+		nvpair = nvl + 4 * 3;
173
+	} else {
174
+		/* skip to the next nvpair */
175
+		encode_size = grub_be_to_cpu32 (grub_get_unaligned32(nvpair));
176
+		nvpair += encode_size;
177
+	}
178
+	/* 8 bytes of 0 marks the end of the list */
179
+	if (*(grub_uint64_t*)nvpair == 0)
180
+		return (NULL);
181
+	/*consistency checks*/
182
+	if (nvpair + 4 * 3 >= nvl + VDEV_PHYS_SIZE)
183
+	{
184
+	  grub_dprintf ("zfs", "nvlist overflow\n");
185
+	  grub_error (GRUB_ERR_BAD_FS, "incorrect nvlist");
186
+	  return (NULL);
187
+	}
188
+	encode_size = grub_be_to_cpu32 (grub_get_unaligned32(nvpair));
189
+
190
+	nvp = nvpair + 4*2;
191
+	name_len = grub_be_to_cpu32 (grub_get_unaligned32 (nvp));
192
+	nvp += 4;
193
+
194
+	nvp = nvp + ((name_len + 3) & ~3); // align 
195
+	if (nvp + 4 >= nvl + VDEV_PHYS_SIZE                        
196
+	    || encode_size < 0
197
+	    || nvp + 4 + encode_size > nvl + VDEV_PHYS_SIZE)       
198
+	{
199
+	  grub_dprintf ("zfs", "nvlist overflow\n");
200
+	  grub_error (GRUB_ERR_BAD_FS, "incorrect nvlist");
201
+	  return (NULL);
202
+	}
203
+	 /* end consistency checks */
204
+
205
+	return (nvpair);
206
+}
207
+/*
208
+ * This function returns 0 on success and 1 on failure. On success, a string
209
+ * containing the name of nvpair is saved in buf.
210
+ */
211
+static int
212
+nvpair_name(const char *nvp, char **buf, int* buflen)
213
+{
214
+	int len;
215
+
216
+	/* skip over encode/decode size */
217
+	nvp += 4 * 2;
218
+
219
+	len = grub_be_to_cpu32 (grub_get_unaligned32 (nvp));
220
+	nvp=nvp+4;
221
+	
222
+	*buf=(char*)nvp;
223
+	*buflen=len;
224
+
225
+	return (0);
226
+}
227
+
228
+/*
229
  * Check the disk label information and retrieve needed vdev name-value pairs.
230
  *
231
  */
232
@@ -773,7 +879,7 @@ check_pool_label (struct grub_zfs_data *data,
233
 		  int *inserted)
234
 {
235
   grub_uint64_t pool_state, txg = 0;
236
-  char *nvlist;
237
+  char *nvlist,*features;
238
 #if 0
239
   char *nv;
240
 #endif
241
@@ -837,13 +943,13 @@ check_pool_label (struct grub_zfs_data *data,
242
     }
243
   grub_dprintf ("zfs", "check 8 passed\n");
244
 
245
-  if (version > SPA_VERSION)
246
+  if (!SPA_VERSION_IS_SUPPORTED(version))
247
     {
248
       grub_free (nvlist);
249
       return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
250
 			 "too new version %llu > %llu",
251
 			 (unsigned long long) version,
252
-			 (unsigned long long) SPA_VERSION);
253
+			 (unsigned long long) SPA_VERSION_BEFORE_FEATURES);
254
     }
255
   grub_dprintf ("zfs", "check 9 passed\n");
256
 
257
@@ -893,7 +999,30 @@ check_pool_label (struct grub_zfs_data *data,
258
     grub_free (nv);
259
   }
260
   grub_dprintf ("zfs", "check 10 passed\n");
261
-
262
+  if ((features=grub_zfs_nvlist_lookup_nvlist(nvlist, ZPOOL_CONFIG_FEATURES_FOR_READ)))
263
+  {
264
+    const char *nvp=NULL;
265
+    char *name = grub_zalloc(51);
266
+    char *nameptr;
267
+    int namelen;
268
+    while ((nvp = nvlist_next_nvpair(features, nvp)) != NULL)
269
+    {
270
+      nvpair_name(nvp, &nameptr,&namelen);
271
+      if(namelen > 50){namelen=50;}
272
+      grub_strncpy(name,nameptr,namelen);
273
+      name[namelen]=0;
274
+      grub_dprintf("zfs","namelen=%u str=%s\n",namelen,name);
275
+      if (check_feature(name,1) != 0)
276
+      {
277
+	grub_dprintf("zfs","feature missing in check_pool_label:%s\n",name);
278
+	err= grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET," check_pool_label missing feature '%s' for read",name);
279
+	grub_free(name);
280
+	return err;
281
+      }
282
+    }
283
+    grub_free(name);
284
+  }
285
+  grub_dprintf ("zfs", "check 12 passed (feature flags)\n");
286
   grub_free (nvlist);
287
 
288
   return GRUB_ERR_NONE;
289
@@ -3034,27 +3163,6 @@ dnode_get_fullpath (const char *fullpath, struct subvolume *subvol,
290
   return err;
291
 }
292
 
293
-/*
294
- * For a given XDR packed nvlist, verify the first 4 bytes and move on.
295
- *
296
- * An XDR packed nvlist is encoded as (comments from nvs_xdr_create) :
297
- *
298
- *      encoding method/host endian     (4 bytes)
299
- *      nvl_version                     (4 bytes)
300
- *      nvl_nvflag                      (4 bytes)
301
- *	encoded nvpairs:
302
- *		encoded size of the nvpair      (4 bytes)
303
- *		decoded size of the nvpair      (4 bytes)
304
- *		name string size                (4 bytes)
305
- *		name string data                (sizeof(NV_ALIGN4(string))
306
- *		data type                       (4 bytes)
307
- *		# of elements in the nvpair     (4 bytes)
308
- *		data
309
- *      2 zero's for the last nvpair
310
- *		(end of the entire list)	(8 bytes)
311
- *
312
- */
313
-
314
 static int
315
 nvlist_find_value (const char *nvlist_in, const char *name,
316
 		   int valtype, char **val,
317
@@ -3386,6 +3494,10 @@ zfs_mount (grub_device_t dev)
318
       return NULL;
319
     }
320
 
321
+    if (ub->ub_version >= SPA_VERSION_FEATURES &&
322
+	check_mos_features(&((objset_phys_t *) osp)->os_meta_dnode,ub_endian, data) != 0)
323
+	  return NULL;
324
+	
325
   /* Got the MOS. Save it at the memory addr MOS. */
326
   grub_memmove (&(data->mos.dn), &((objset_phys_t *) osp)->os_meta_dnode,
327
 		DNODE_SIZE);
328
@@ -3910,6 +4022,64 @@ grub_zfs_dir (grub_device_t device, const char *path,
329
   return grub_errno;
330
 }
331
 
332
+static int NESTED_FUNC_ATTR
333
+check_feature(const char *name, grub_uint64_t val)
334
+{
335
+  int i;
336
+  if(val ==0) return 0;
337
+  if(*name==0) return 0;
338
+  for (i = 0; spa_feature_names[i] != NULL; i++) 
339
+  {
340
+    if (grub_strcmp(name, spa_feature_names[i]) == 0) 
341
+        return 0;
342
+  }
343
+  grub_printf("missing feature for read '%s'\n",name);
344
+  return 1;
345
+}
346
+
347
+/*
348
+ * Checks whether the MOS features that are active are supported by this
349
+ * (GRUB's) implementation of ZFS.
350
+ *
351
+ * Return:
352
+ *	0: Success.
353
+ *	errnum: Failure.
354
+ */
355
+	    	   
356
+static int
357
+check_mos_features(dnode_phys_t *mosmdn_phys,grub_zfs_endian_t endian,struct grub_zfs_data* data )
358
+{
359
+  grub_uint64_t objnum;
360
+  grub_uint8_t errnum = 0;
361
+  dnode_end_t dn,mosmdn;
362
+  mzap_phys_t* mzp;
363
+  grub_zfs_endian_t endianzap;
364
+  int size;
365
+  grub_memmove(&(mosmdn.dn),mosmdn_phys,sizeof(dnode_phys_t));
366
+  mosmdn.endian=endian;
367
+  if ((errnum = dnode_get(&mosmdn, DMU_POOL_DIRECTORY_OBJECT,
368
+	  DMU_OT_OBJECT_DIRECTORY, &dn,data)) != 0)
369
+      return (errnum);
370
+
371
+  /*
372
+   * Find the object number for 'features_for_read' and retrieve its
373
+   * corresponding dnode. Note that we don't check features_for_write
374
+   * because GRUB is not opening the pool for write.
375
+   */
376
+  if ((errnum = zap_lookup(&dn, DMU_POOL_FEATURES_FOR_READ, &objnum, data,0)) != 0)
377
+      return (errnum);
378
+  
379
+  if ((errnum = dnode_get(&mosmdn, objnum, DMU_OTN_ZAP_METADATA, &dn, data)) != 0)
380
+      return (errnum);
381
+
382
+  if ((errnum = dmu_read(&dn, 0, (void**)&mzp, &endianzap,data)) != 0)
383
+      return (errnum);
384
+
385
+  size = grub_zfs_to_cpu16 (dn.dn.dn_datablkszsec, dn.endian) << SPA_MINBLOCKSHIFT;
386
+  return (mzap_iterate(mzp,endianzap, size, check_feature));
387
+}
388
+
389
+
390
 #ifdef GRUB_UTIL
391
 static grub_err_t
392
 grub_zfs_embed (grub_device_t device __attribute__ ((unused)),
393
diff --git a/grub-core/fs/zfs/zfs_lz4.c b/grub-core/fs/zfs/zfs_lz4.c
394
new file mode 100644
395
index 0000000..ff85a77
396
--- /dev/null
397
+++ grub-core/fs/zfs/zfs_lz4.c
398
@@ -0,0 +1,318 @@
399
+/*
400
+ * LZ4 - Fast LZ compression algorithm
401
+ * Header File
402
+ * Copyright (C) 2011-2013, Yann Collet.
403
+ * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
404
+ *
405
+ * Redistribution and use in source and binary forms, with or without
406
+ * modification, are permitted provided that the following conditions are
407
+ * met:
408
+ *
409
+ *     * Redistributions of source code must retain the above copyright
410
+ * notice, this list of conditions and the following disclaimer.
411
+ *     * Redistributions in binary form must reproduce the above
412
+ * copyright notice, this list of conditions and the following disclaimer
413
+ * in the documentation and/or other materials provided with the
414
+ * distribution.
415
+ *
416
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
417
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
418
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
419
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
420
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
421
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
422
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
423
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
424
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
425
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
426
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
427
+ *
428
+ * You can contact the author at :
429
+ * - LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html
430
+ * - LZ4 source repository : http://code.google.com/p/lz4/
431
+ */
432
+
433
+#include <sys/endian.h>
434
+#include <grub/err.h>
435
+#include <grub/mm.h>
436
+#include <grub/misc.h>
437
+#include <grub/types.h>
438
+
439
+static int LZ4_uncompress_unknownOutputSize(const char *source, char *dest,
440
+					    int isize, int maxOutputSize);
441
+
442
+/*
443
+ * CPU Feature Detection
444
+ */
445
+
446
+/* 32 or 64 bits ? */
447
+#if (defined(__x86_64__) || defined(__x86_64) || defined(__amd64__) || \
448
+	defined(__amd64) || defined(__ppc64__) || defined(_WIN64) || \
449
+	defined(__LP64__) || defined(_LP64))
450
+#define	LZ4_ARCH64	1
451
+#else
452
+#define	LZ4_ARCH64	0
453
+#endif
454
+
455
+/*
456
+ * Little Endian or Big Endian?
457
+ * Note: overwrite the below #define if you know your architecture endianess.
458
+ */
459
+#if BYTE_ORDER == BIG_ENDIAN
460
+#define	LZ4_BIG_ENDIAN	1
461
+#else
462
+	/*
463
+	 * Little Endian assumed. PDP Endian and other very rare endian format
464
+	 * are unsupported.
465
+	 */
466
+#endif
467
+
468
+/*
469
+ * Compiler Options
470
+ */
471
+
472
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L	/* C99 */
473
+/* "restrict" is a known keyword */
474
+#else
475
+/* Disable restrict */
476
+#ifndef restrict
477
+#define	restrict /* Only if somebody already didn't take care of that.*/
478
+#endif
479
+#endif
480
+
481
+#define	GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
482
+
483
+#define	lz4_bswap16(x) ((unsigned short int) ((((x) >> 8) & 0xffu) \
484
+	| (((x) & 0xffu) << 8)))
485
+
486
+#if (GCC_VERSION >= 302) || (__INTEL_COMPILER >= 800) || defined(__clang__)
487
+#define	expect(expr, value)    (__builtin_expect((expr), (value)))
488
+#else
489
+#define	expect(expr, value)    (expr)
490
+#endif
491
+
492
+#define	likely(expr)	expect((expr) != 0, 1)
493
+#define	unlikely(expr)	expect((expr) != 0, 0)
494
+
495
+/* Basic types */
496
+#define	BYTE	grub_uint8_t
497
+#define	U16	grub_uint16_t
498
+#define	U32	grub_uint32_t
499
+#define	S32	grub_int32_t
500
+#define	U64	grub_uint64_t
501
+typedef grub_size_t size_t;
502
+
503
+typedef struct _U16_S {
504
+	U16 v;
505
+} U16_S;
506
+typedef struct _U32_S {
507
+	U32 v;
508
+} U32_S;
509
+typedef struct _U64_S {
510
+	U64 v;
511
+} U64_S;
512
+
513
+#define	A64(x)	(((U64_S *)(x))->v)
514
+#define	A32(x)	(((U32_S *)(x))->v)
515
+#define	A16(x)	(((U16_S *)(x))->v)
516
+
517
+/*
518
+ * Constants
519
+ */
520
+#define	MINMATCH 4
521
+
522
+#define	COPYLENGTH 8
523
+#define	LASTLITERALS 5
524
+
525
+#define	ML_BITS 4
526
+#define	ML_MASK ((1U<<ML_BITS)-1)
527
+#define	RUN_BITS (8-ML_BITS)
528
+#define	RUN_MASK ((1U<<RUN_BITS)-1)
529
+
530
+/*
531
+ * Architecture-specific macros
532
+ */
533
+#if LZ4_ARCH64
534
+#define	STEPSIZE 8
535
+#define	UARCH U64
536
+#define	AARCH A64
537
+#define	LZ4_COPYSTEP(s, d)	A64(d) = A64(s); d += 8; s += 8;
538
+#define	LZ4_COPYPACKET(s, d)	LZ4_COPYSTEP(s, d)
539
+#define	LZ4_SECURECOPY(s, d, e)	if (d < e) LZ4_WILDCOPY(s, d, e)
540
+#define	HTYPE U32
541
+#define	INITBASE(base)		const BYTE* const base = ip
542
+#else
543
+#define	STEPSIZE 4
544
+#define	UARCH U32
545
+#define	AARCH A32
546
+#define	LZ4_COPYSTEP(s, d)	A32(d) = A32(s); d += 4; s += 4;
547
+#define	LZ4_COPYPACKET(s, d)	LZ4_COPYSTEP(s, d); LZ4_COPYSTEP(s, d);
548
+#define	LZ4_SECURECOPY		LZ4_WILDCOPY
549
+#define	HTYPE const BYTE*
550
+#define	INITBASE(base)		const int base = 0
551
+#endif
552
+
553
+#if (defined(LZ4_BIG_ENDIAN) && !defined(BIG_ENDIAN_NATIVE_BUT_INCOMPATIBLE))
554
+#define	LZ4_READ_LITTLEENDIAN_16(d, s, p) \
555
+	{ U16 v = A16(p); v = lz4_bswap16(v); d = (s) - v; }
556
+#define	LZ4_WRITE_LITTLEENDIAN_16(p, i) \
557
+	{ U16 v = (U16)(i); v = lz4_bswap16(v); A16(p) = v; p += 2; }
558
+#else
559
+#define	LZ4_READ_LITTLEENDIAN_16(d, s, p) { d = (s) - A16(p); }
560
+#define	LZ4_WRITE_LITTLEENDIAN_16(p, v)  { A16(p) = v; p += 2; }
561
+#endif
562
+
563
+/* Macros */
564
+#define	LZ4_WILDCOPY(s, d, e) do { LZ4_COPYPACKET(s, d) } while (d < e);
565
+
566
+/* Decompression functions */
567
+grub_err_t
568
+lz4_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len);
569
+
570
+grub_err_t
571
+lz4_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len)
572
+{
573
+	const BYTE *src = s_start;
574
+	U32 bufsiz = (src[0] << 24) | (src[1] << 16) | (src[2] << 8) |
575
+	    src[3];
576
+
577
+	/* invalid compressed buffer size encoded at start */
578
+	if (bufsiz + 4 > s_len)
579
+		return grub_error(GRUB_ERR_BAD_FS,"lz4 decompression failed.");
580
+
581
+	/*
582
+	 * Returns 0 on success (decompression function returned non-negative)
583
+	 * and appropriate error on failure (decompression function returned negative).
584
+	 */
585
+	return (LZ4_uncompress_unknownOutputSize((char*)s_start + 4, d_start, bufsiz,
586
+	    d_len) < 0)?grub_error(GRUB_ERR_BAD_FS,"lz4 decompression failed."):0;
587
+}
588
+
589
+static int
590
+LZ4_uncompress_unknownOutputSize(const char *source,
591
+    char *dest, int isize, int maxOutputSize)
592
+{
593
+	/* Local Variables */
594
+	const BYTE *restrict ip = (const BYTE *) source;
595
+	const BYTE *const iend = ip + isize;
596
+	const BYTE *restrict ref;
597
+
598
+	BYTE *restrict op = (BYTE *) dest;
599
+	BYTE *const oend = op + maxOutputSize;
600
+	BYTE *cpy;
601
+
602
+	size_t dec[] = { 0, 3, 2, 3, 0, 0, 0, 0 };
603
+
604
+	/* Main Loop */
605
+	while (ip < iend) {
606
+		BYTE token;
607
+		int length;
608
+
609
+		/* get runlength */
610
+		token = *ip++;
611
+		if ((length = (token >> ML_BITS)) == RUN_MASK) {
612
+			int s = 255;
613
+			while ((ip < iend) && (s == 255)) {
614
+				s = *ip++;
615
+				length += s;
616
+			}
617
+		}
618
+		/* copy literals */
619
+		cpy = op + length;
620
+		if ((cpy > oend - COPYLENGTH) ||
621
+		    (ip + length > iend - COPYLENGTH)) {
622
+			if (cpy > oend)
623
+				/*
624
+				 * Error: request to write beyond destination
625
+				 * buffer.
626
+				 */
627
+				goto _output_error;
628
+			if (ip + length > iend)
629
+				/*
630
+				 * Error : request to read beyond source
631
+				 * buffer.
632
+				 */
633
+				goto _output_error;
634
+			grub_memcpy(op, ip, length);
635
+			op += length;
636
+			ip += length;
637
+			if (ip < iend)
638
+				/* Error : LZ4 format violation */
639
+				goto _output_error;
640
+			/* Necessarily EOF, due to parsing restrictions. */
641
+			break;
642
+		}
643
+		LZ4_WILDCOPY(ip, op, cpy);
644
+		ip -= (op - cpy);
645
+		op = cpy;
646
+
647
+		/* get offset */
648
+		LZ4_READ_LITTLEENDIAN_16(ref, cpy, ip);
649
+		ip += 2;
650
+		if (ref < (BYTE * const) dest)
651
+			/*
652
+			 * Error: offset creates reference outside of
653
+			 * destination buffer.
654
+			 */
655
+			goto _output_error;
656
+
657
+		/* get matchlength */
658
+		if ((length = (token & ML_MASK)) == ML_MASK) {
659
+			while (ip < iend) {
660
+				int s = *ip++;
661
+				length += s;
662
+				if (s == 255)
663
+					continue;
664
+				break;
665
+			}
666
+		}
667
+		/* copy repeated sequence */
668
+		if unlikely(op - ref < STEPSIZE) {
669
+#if LZ4_ARCH64
670
+			size_t dec2table[] = { 0, 0, 0, -1, 0, 1, 2, 3 };
671
+			size_t dec2 = dec2table[op - ref];
672
+#else
673
+			const int dec2 = 0;
674
+#endif
675
+			*op++ = *ref++;
676
+			*op++ = *ref++;
677
+			*op++ = *ref++;
678
+			*op++ = *ref++;
679
+			ref -= dec[op - ref];
680
+			A32(op) = A32(ref);
681
+			op += STEPSIZE - 4;
682
+			ref -= dec2;
683
+		} else {
684
+			LZ4_COPYSTEP(ref, op);
685
+		}
686
+		cpy = op + length - (STEPSIZE - 4);
687
+		if (cpy > oend - COPYLENGTH) {
688
+			if (cpy > oend)
689
+				/*
690
+				 * Error: request to write outside of
691
+				 * destination buffer.
692
+				 */
693
+				goto _output_error;
694
+			LZ4_SECURECOPY(ref, op, (oend - COPYLENGTH));
695
+			while (op < cpy)
696
+				*op++ = *ref++;
697
+			op = cpy;
698
+			if (op == oend)
699
+				/*
700
+				 * Check EOF (should never happen, since last
701
+				 * 5 bytes are supposed to be literals).
702
+				 */
703
+				break;
704
+			continue;
705
+		}
706
+		LZ4_SECURECOPY(ref, op, cpy);
707
+		op = cpy;	/* correction */
708
+	}
709
+
710
+	/* end of decoding */
711
+	return (int)(((char *)op) - dest);
712
+
713
+	/* write overflow error detected */
714
+	_output_error:
715
+	return (int)(-(((char *)ip) - source));
716
+}
717
diff --git a/grub-core/fs/zfs/zfsinfo.c b/grub-core/fs/zfs/zfsinfo.c
718
index fdb587a..c96bf21 100644
719
--- grub-core/fs/zfs/zfsinfo.c
720
+++ grub-core/fs/zfs/zfsinfo.c
721
@@ -132,21 +132,31 @@ print_vdev_info (char *nvlist, int tab)
722
       grub_free (path);
723
       return GRUB_ERR_NONE;
724
     }
725
+  char is_mirror=(grub_strcmp(type,VDEV_TYPE_MIRROR) == 0);
726
+  char is_raidz=(grub_strcmp(type,VDEV_TYPE_RAIDZ) == 0);
727
 
728
-  if (grub_strcmp (type, VDEV_TYPE_MIRROR) == 0)
729
+  if (is_mirror || is_raidz)
730
     {
731
       int nelm, i;
732
 
733
       nelm = grub_zfs_nvlist_lookup_nvlist_array_get_nelm
734
 	(nvlist, ZPOOL_CONFIG_CHILDREN);
735
 
736
+      if(is_mirror){
737
+	 grub_puts_ (N_("This VDEV is a mirror"));
738
+      }
739
+      else if(is_raidz){
740
+	 grub_uint64_t parity;
741
+	 grub_zfs_nvlist_lookup_uint64(nvlist,"nparity",&parity);
742
+	 grub_printf_ (N_("This VDEV is a RAIDZ%llu\n"),(unsigned long long)parity);
743
+      }
744
       print_tabs (tab);
745
       if (nelm <= 0)
746
 	{
747
-	  grub_puts_ (N_("Incorrect mirror"));
748
+	  grub_puts_ (N_("Incorrect VDEV"));
749
 	  return GRUB_ERR_NONE;
750
 	}
751
-      grub_printf_ (N_("Mirror with %d children\n"), nelm);
752
+      grub_printf_ (N_("VDEV with %d children\n"), nelm);
753
       print_state (nvlist, tab);
754
       for (i = 0; i < nelm; i++)
755
 	{
756
@@ -162,14 +172,14 @@ print_vdev_info (char *nvlist, int tab)
757
 		 total element number. And the number itself is fine,
758
 		 only the element isn't.
759
 	      */
760
-	      grub_printf_ (N_("Mirror element number %d isn't correct\n"), i);
761
+	      grub_printf_ (N_("VDEV element number %d isn't correct\n"), i);
762
 	      continue;
763
 	    }
764
 
765
 	  /* TRANSLATORS: it's the element carying the number %d, not
766
 	     total element number. This is used in enumeration
767
 	     "Element number 1", "Element number 2", ... */
768
-	  grub_printf_ (N_("Mirror element number %d:\n"), i);
769
+	  grub_printf_ (N_("VDEV element number %d:\n"), i);
770
 	  print_vdev_info (child, tab + 1);
771
 
772
 	  grub_free (child);
773
diff --git a/include/grub/zfs/dmu.h b/include/grub/zfs/dmu.h
774
index 8fc6dc5..4ad616c 100644
775
--- include/grub/zfs/dmu.h
776
+++ include/grub/zfs/dmu.h
777
@@ -22,6 +22,39 @@
778
 
779
 #ifndef	_SYS_DMU_H
780
 #define	_SYS_DMU_H
781
+#define	B_FALSE	0
782
+#define	B_TRUE	1
783
+
784
+#define	DMU_OT_NEWTYPE 0x80
785
+#define	DMU_OT_METADATA 0x40
786
+#define	DMU_OT_BYTESWAP_MASK 0x3f
787
+
788
+#define	DMU_OT(byteswap, metadata) \
789
+	(DMU_OT_NEWTYPE | \
790
+	((metadata) ? DMU_OT_METADATA : 0) | \
791
+	((byteswap) & DMU_OT_BYTESWAP_MASK))
792
+
793
+#define	DMU_OT_IS_VALID(ot) (((ot) & DMU_OT_NEWTYPE) ? \
794
+	((ot) & DMU_OT_BYTESWAP_MASK) < DMU_BSWAP_NUMFUNCS : \
795
+	(ot) < DMU_OT_NUMTYPES)
796
+
797
+#define	DMU_OT_IS_METADATA(ot) (((ot) & DMU_OT_NEWTYPE) ? \
798
+	((ot) & DMU_OT_METADATA) : \
799
+	dmu_ot[(ot)].ot_metadata)
800
+
801
+typedef enum dmu_object_byteswap {
802
+	DMU_BSWAP_UINT8,
803
+	DMU_BSWAP_UINT16,
804
+	DMU_BSWAP_UINT32,
805
+	DMU_BSWAP_UINT64,
806
+	DMU_BSWAP_ZAP,
807
+	DMU_BSWAP_DNODE,
808
+	DMU_BSWAP_OBJSET,
809
+	DMU_BSWAP_ZNODE,
810
+	DMU_BSWAP_OLDACL,
811
+	DMU_BSWAP_ACL,
812
+	DMU_BSWAP_NUMFUNCS
813
+} dmu_object_byteswap_t;
814
 
815
 /*
816
  * This file describes the interface that the DMU provides for its
817
@@ -89,7 +122,17 @@ typedef enum dmu_object_type {
818
 	DMU_OT_SA_ATTR_REGISTRATION,	/* ZAP */
819
 	DMU_OT_SA_ATTR_LAYOUTS,		/* ZAP */
820
 	DMU_OT_DSL_KEYCHAIN = 54,
821
-	DMU_OT_NUMTYPES
822
+	DMU_OT_NUMTYPES,
823
+	DMU_OTN_UINT8_DATA = DMU_OT(DMU_BSWAP_UINT8, B_FALSE),
824
+	DMU_OTN_UINT8_METADATA = DMU_OT(DMU_BSWAP_UINT8, B_TRUE),
825
+	DMU_OTN_UINT16_DATA = DMU_OT(DMU_BSWAP_UINT16, B_FALSE),
826
+	DMU_OTN_UINT16_METADATA = DMU_OT(DMU_BSWAP_UINT16, B_TRUE),
827
+	DMU_OTN_UINT32_DATA = DMU_OT(DMU_BSWAP_UINT32, B_FALSE),
828
+	DMU_OTN_UINT32_METADATA = DMU_OT(DMU_BSWAP_UINT32, B_TRUE),
829
+	DMU_OTN_UINT64_DATA = DMU_OT(DMU_BSWAP_UINT64, B_FALSE),
830
+	DMU_OTN_UINT64_METADATA = DMU_OT(DMU_BSWAP_UINT64, B_TRUE),
831
+	DMU_OTN_ZAP_DATA = DMU_OT(DMU_BSWAP_ZAP, B_FALSE),
832
+	DMU_OTN_ZAP_METADATA = DMU_OT(DMU_BSWAP_ZAP, B_TRUE),
833
 } dmu_object_type_t;
834
 
835
 typedef enum dmu_objset_type {
836
@@ -116,5 +159,6 @@ typedef enum dmu_objset_type {
837
 #define	DMU_POOL_HISTORY		"history"
838
 #define	DMU_POOL_PROPS			"pool_props"
839
 #define	DMU_POOL_L2CACHE		"l2cache"
840
+#define	DMU_POOL_FEATURES_FOR_READ	"features_for_read"
841
 
842
 #endif	/* _SYS_DMU_H */
843
diff --git a/include/grub/zfs/zfs.h b/include/grub/zfs/zfs.h
844
index e326c8b..761ade7 100644
845
--- include/grub/zfs/zfs.h
846
+++ include/grub/zfs/zfs.h
847
@@ -36,8 +36,13 @@ typedef enum grub_zfs_endian
848
 /*
849
  * On-disk version number.
850
  */
851
-#define	SPA_VERSION			33ULL
852
-
853
+#define	SPA_VERSION_INITIAL		1ULL
854
+#define	SPA_VERSION_BEFORE_FEATURES	33ULL
855
+#define	SPA_VERSION			5000ULL
856
+#define	SPA_VERSION_FEATURES		5000ULL
857
+#define	SPA_VERSION_IS_SUPPORTED(v) \
858
+	(((v) >= SPA_VERSION_INITIAL && (v) <= SPA_VERSION_BEFORE_FEATURES) || \
859
+	((v) >= SPA_VERSION_FEATURES && (v) <= SPA_VERSION))
860
 /*
861
  * The following are configuration names used in the nvlist describing a pool's
862
  * configuration.
863
@@ -76,6 +81,7 @@ typedef enum grub_zfs_endian
864
 #define	ZPOOL_CONFIG_DDT_HISTOGRAM	"ddt_histogram"
865
 #define	ZPOOL_CONFIG_DDT_OBJ_STATS	"ddt_object_stats"
866
 #define	ZPOOL_CONFIG_DDT_STATS		"ddt_stats"
867
+#define	ZPOOL_CONFIG_FEATURES_FOR_READ	"features_for_read"
868
 /*
869
  * The persistent vdev state is stored as separate values rather than a single
870
  * 'vdev_state' entry.  This is because a device can be in multiple states, such
871
diff --git a/include/grub/zfs/zio.h b/include/grub/zfs/zio.h
872
index b1c46da..8fad2cc 100644
873
--- include/grub/zfs/zio.h
874
+++ include/grub/zfs/zio.h
875
@@ -88,6 +88,7 @@ enum zio_compress {
876
 	ZIO_COMPRESS_GZIP8,
877
 	ZIO_COMPRESS_GZIP9,
878
 	ZIO_COMPRESS_ZLE,
879
+	ZIO_COMPRESS_LZ4,
880
 	ZIO_COMPRESS_FUNCTIONS
881
 };
882
 
883
diff --git a/po/POTFILES.in b/po/POTFILES.in
884
index 987b37a..c55d9e3 100644
885
--- po/POTFILES.in
886
+++ po/POTFILES.in
887
@@ -173,6 +173,7 @@
888
 ./grub-core/fs/zfs/zfs_fletcher.c
889
 ./grub-core/fs/zfs/zfsinfo.c
890
 ./grub-core/fs/zfs/zfs_lzjb.c
891
+./grub-core/fs/zfs/zfs_lz4.c
892
 ./grub-core/fs/zfs/zfs_sha256.c
893
 ./grub-core/gdb/cstub.c
894
 ./grub-core/gdb/gdb.c
(-)sysutils/grub2/files/patch-grub-core-Makefile.core.am (-128 lines)
Lines 1-128 Link Here
1
--- grub-core/Makefile.core.am.orig
2
+++ grub-core/Makefile.core.am
3
@@ -32004,7 +32004,7 @@ endif
4
 if COND_emu
5
 platform_PROGRAMS += zfs.module
6
 MODULE_FILES += zfs.module$(EXEEXT)
7
-zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
8
+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
9
 nodist_zfs_module_SOURCES  =  ## platform nodist sources
10
 zfs_module_LDADD  = 
11
 zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
12
@@ -32026,7 +32026,7 @@ endif
13
 if COND_i386_pc
14
 platform_PROGRAMS += zfs.module
15
 MODULE_FILES += zfs.module$(EXEEXT)
16
-zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
17
+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
18
 nodist_zfs_module_SOURCES  =  ## platform nodist sources
19
 zfs_module_LDADD  = 
20
 zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
21
@@ -32048,7 +32048,7 @@ endif
22
 if COND_i386_efi
23
 platform_PROGRAMS += zfs.module
24
 MODULE_FILES += zfs.module$(EXEEXT)
25
-zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
26
+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
27
 nodist_zfs_module_SOURCES  =  ## platform nodist sources
28
 zfs_module_LDADD  = 
29
 zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
30
@@ -32070,7 +32070,7 @@ endif
31
 if COND_i386_qemu
32
 platform_PROGRAMS += zfs.module
33
 MODULE_FILES += zfs.module$(EXEEXT)
34
-zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
35
+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
36
 nodist_zfs_module_SOURCES  =  ## platform nodist sources
37
 zfs_module_LDADD  = 
38
 zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
39
@@ -32092,7 +32092,7 @@ endif
40
 if COND_i386_coreboot
41
 platform_PROGRAMS += zfs.module
42
 MODULE_FILES += zfs.module$(EXEEXT)
43
-zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
44
+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
45
 nodist_zfs_module_SOURCES  =  ## platform nodist sources
46
 zfs_module_LDADD  = 
47
 zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
48
@@ -32114,7 +32114,7 @@ endif
49
 if COND_i386_multiboot
50
 platform_PROGRAMS += zfs.module
51
 MODULE_FILES += zfs.module$(EXEEXT)
52
-zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
53
+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
54
 nodist_zfs_module_SOURCES  =  ## platform nodist sources
55
 zfs_module_LDADD  = 
56
 zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
57
@@ -32136,7 +32136,7 @@ endif
58
 if COND_i386_ieee1275
59
 platform_PROGRAMS += zfs.module
60
 MODULE_FILES += zfs.module$(EXEEXT)
61
-zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
62
+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
63
 nodist_zfs_module_SOURCES  =  ## platform nodist sources
64
 zfs_module_LDADD  = 
65
 zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
66
@@ -32158,7 +32158,7 @@ endif
67
 if COND_x86_64_efi
68
 platform_PROGRAMS += zfs.module
69
 MODULE_FILES += zfs.module$(EXEEXT)
70
-zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
71
+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
72
 nodist_zfs_module_SOURCES  =  ## platform nodist sources
73
 zfs_module_LDADD  = 
74
 zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
75
@@ -32180,7 +32180,7 @@ endif
76
 if COND_mips_loongson
77
 platform_PROGRAMS += zfs.module
78
 MODULE_FILES += zfs.module$(EXEEXT)
79
-zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
80
+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
81
 nodist_zfs_module_SOURCES  =  ## platform nodist sources
82
 zfs_module_LDADD  = 
83
 zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
84
@@ -32202,7 +32202,7 @@ endif
85
 if COND_sparc64_ieee1275
86
 platform_PROGRAMS += zfs.module
87
 MODULE_FILES += zfs.module$(EXEEXT)
88
-zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
89
+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
90
 nodist_zfs_module_SOURCES  =  ## platform nodist sources
91
 zfs_module_LDADD  = 
92
 zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
93
@@ -32224,7 +32224,7 @@ endif
94
 if COND_powerpc_ieee1275
95
 platform_PROGRAMS += zfs.module
96
 MODULE_FILES += zfs.module$(EXEEXT)
97
-zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
98
+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
99
 nodist_zfs_module_SOURCES  =  ## platform nodist sources
100
 zfs_module_LDADD  = 
101
 zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
102
@@ -32246,7 +32246,7 @@ endif
103
 if COND_mips_arc
104
 platform_PROGRAMS += zfs.module
105
 MODULE_FILES += zfs.module$(EXEEXT)
106
-zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
107
+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
108
 nodist_zfs_module_SOURCES  =  ## platform nodist sources
109
 zfs_module_LDADD  = 
110
 zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
111
@@ -32268,7 +32268,7 @@ endif
112
 if COND_ia64_efi
113
 platform_PROGRAMS += zfs.module
114
 MODULE_FILES += zfs.module$(EXEEXT)
115
-zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
116
+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
117
 nodist_zfs_module_SOURCES  =  ## platform nodist sources
118
 zfs_module_LDADD  = 
119
 zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
120
@@ -32290,7 +32290,7 @@ endif
121
 if COND_mips_qemu_mips
122
 platform_PROGRAMS += zfs.module
123
 MODULE_FILES += zfs.module$(EXEEXT)
124
-zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
125
+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
126
 nodist_zfs_module_SOURCES  =  ## platform nodist sources
127
 zfs_module_LDADD  = 
128
 zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
(-)sysutils/grub2/files/patch-grub-core-gnulib-Makefile.am (-2 / +2 lines)
Lines 1-6 Link Here
1
--- grub-core/gnulib/Makefile.am.orig
1
--- grub-core/gnulib/Makefile.am.orig	2019-02-06 10:34:50 UTC
2
+++ grub-core/gnulib/Makefile.am
2
+++ grub-core/gnulib/Makefile.am
3
@@ -404,13 +404,13 @@ all-local: charset.alias ref-add.sed ref
3
@@ -388,13 +388,13 @@ all-local: charset.alias ref-add.sed ref-del.sed
4
 
4
 
5
 charset_alias = $(DESTDIR)$(libdir)/charset.alias
5
 charset_alias = $(DESTDIR)$(libdir)/charset.alias
6
 charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
6
 charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
(-)sysutils/grub2/files/patch-grub-core-gnulib-argp-fmtstream.c (-2 / +2 lines)
Lines 1-6 Link Here
1
--- grub-core/gnulib/argp-fmtstream.c.orig
1
--- grub-core/gnulib/argp-fmtstream.c.orig	2019-02-06 10:34:50 UTC
2
+++ grub-core/gnulib/argp-fmtstream.c
2
+++ grub-core/gnulib/argp-fmtstream.c
3
@@ -47,7 +47,11 @@
3
@@ -48,7 +48,11 @@
4
 #endif
4
 #endif
5
 
5
 
6
 #define INIT_BUF_SIZE 200
6
 #define INIT_BUF_SIZE 200
(-)sysutils/grub2/files/patch-grub-core-loader-i386-bsd.c (-49 lines)
Lines 1-49 Link Here
1
=== modified file 'grub-core/loader/i386/bsd.c'
2
--- grub-core/loader/i386/bsd.c	2012-06-07 14:41:52 +0000
3
+++ grub-core/loader/i386/bsd.c	2012-07-21 17:44:45 +0000
4
@@ -1309,7 +1309,7 @@
5
       && phdr->p_type != PT_DYNAMIC)
6
       return 0;
7
 
8
-  paddr = phdr->p_paddr & 0xFFFFFF;
9
+  paddr = phdr->p_paddr & 0xFFFFFFF;
10
 
11
   if (paddr < kern_start)
12
     kern_start = paddr;
13
@@ -1333,7 +1333,7 @@
14
     }
15
 
16
   *do_load = 1;
17
-  phdr->p_paddr &= 0xFFFFFF;
18
+  phdr->p_paddr &= 0xFFFFFFF;
19
   paddr = phdr->p_paddr;
20
 
21
   *addr = (grub_addr_t) (paddr - kern_start + (grub_uint8_t *) kern_chunk_src);
22
@@ -1351,7 +1351,7 @@
23
       && phdr->p_type != PT_DYNAMIC)
24
     return 0;
25
 
26
-  paddr = phdr->p_paddr & 0xffffff;
27
+  paddr = phdr->p_paddr & 0xfffffff;
28
 
29
   if (paddr < kern_start)
30
     kern_start = paddr;
31
@@ -1375,7 +1375,7 @@
32
     }
33
 
34
   *do_load = 1;
35
-  paddr = phdr->p_paddr & 0xffffff;
36
+  paddr = phdr->p_paddr & 0xfffffff;
37
 
38
   *addr = (grub_addr_t) (paddr - kern_start + (grub_uint8_t *) kern_chunk_src);
39
 
40
@@ -1394,7 +1394,7 @@
41
     {
42
       grub_relocator_chunk_t ch;
43
 
44
-      entry = elf->ehdr.ehdr32.e_entry & 0xFFFFFF;
45
+      entry = elf->ehdr.ehdr32.e_entry & 0xFFFFFFF;
46
       err = grub_elf32_phdr_iterate (elf, filename,
47
 				     grub_bsd_elf32_size_hook, NULL);
48
       if (err)
49
(-)sysutils/grub2/files/patch-grub-core_osdep_generic_blocklist.c (+20 lines)
Line 0 Link Here
1
--- grub-core/osdep/generic/blocklist.c.orig	2019-02-20 16:58:21 UTC
2
+++ grub-core/osdep/generic/blocklist.c
3
@@ -59,7 +59,7 @@ grub_install_get_blocklist (grub_device_t root_dev,
4
 
5
       grub_disk_cache_invalidate_all ();
6
 
7
-      file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | FILE_TYPE_NO_DECOMPRESS);
8
+      file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | GRUB_FILE_TYPE_NO_DECOMPRESS);
9
       if (file)
10
 	{
11
 	  if (grub_file_size (file) != core_size)
12
@@ -116,7 +116,7 @@ grub_install_get_blocklist (grub_device_t root_dev,
13
 
14
   grub_file_t file;
15
   /* Now read the core image to determine where the sectors are.  */
16
-  file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | FILE_TYPE_NO_DECOMPRESS);
17
+  file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | GRUB_FILE_TYPE_NO_DECOMPRESS);
18
   if (! file)
19
     grub_util_error ("%s", grub_errmsg);
20
 
(-)sysutils/grub2/files/patch-include-grub-util-libzfs.h (-1 / +1 lines)
Lines 1-4 Link Here
1
--- include/grub/util/libzfs.h.orig
1
--- include/grub/util/libzfs.h.orig	2019-02-06 10:34:50 UTC
2
+++ include/grub/util/libzfs.h
2
+++ include/grub/util/libzfs.h
3
@@ -22,6 +22,9 @@
3
@@ -22,6 +22,9 @@
4
 #include <config.h>
4
 #include <config.h>
(-)sysutils/grub2/files/patch-util-grub-mkfont.c (-13 lines)
Lines 1-13 Link Here
1
--- util/grub-mkfont.c.orig
2
+++ util/grub-mkfont.c
3
@@ -39,7 +39,7 @@
4
 #include FT_FREETYPE_H
5
 #include FT_TRUETYPE_TAGS_H
6
 #include FT_TRUETYPE_TABLES_H
7
-#include <freetype/ftsynth.h>
8
+#include FT_SYNTHESIS_H
9
 
10
 #undef __FTERRORS_H__
11
 #define FT_ERROR_START_LIST   const char *ft_errmsgs[] = { 
12
13
(-)sysutils/grub2/files/patch-util_grub-install.in (-72 lines)
Lines 1-72 Link Here
1
--- util/grub-install.in.orig	2012-06-26 21:31:03.000000000 +0000
2
+++ util/grub-install.in
3
@@ -107,6 +107,8 @@ usage () {
4
     print_option_help "--recheck" "$(gettext "delete device map if it already exists")"
5
     print_option_help "--force" "$(gettext "install even if problems are detected")"
6
     print_option_help "--force-file-id" "$(gettext "use identifier file even if UUID is available")"
7
+    print_option_help "--force-label" "$(gettext "use filesystem label even if UUID is available")"
8
+
9
     print_option_help "--disk-module=$(gettext "MODULE")" "$(gettext "disk module to use (biosdisk or native). This option is only available on BIOS target.")"
10
     print_option_help "--no-nvram" "$(gettext "don't update the \`boot-device' NVRAM variable. This option is only available on IEEE1275 targets.")"
11
     print_option_help  "--removable" "$(gettext "the installation device is removable. This option is only available on EFI.")"
12
@@ -159,6 +161,9 @@ do
13
     --force-file-id)
14
 	force_file_id=y ;;
15
 
16
+    --force-label)
17
+	force_fs_label=y ;;
18
+
19
 # Accept and ignore for compatibility
20
     --font)
21
         shift;;
22
@@ -585,7 +590,7 @@ fi
23
 partmap_module=
24
 for x in `echo "${grub_device}" | xargs "$grub_probe" --device-map="${device_map}" --target=partmap --device 2> /dev/null`; do
25
    case "$x" in
26
-       netbsd | openbsd) 
27
+       netbsd | openbsd | freebsd )
28
 	   partmap_module="$partmap_module part_bsd";;
29
        "") ;;
30
        *)
31
@@ -593,6 +598,11 @@ for x in `echo "${grub_device}" | xargs 
32
    esac
33
 done
34
 
35
+case `uname -o` in 
36
+    FreeBSD)
37
+	    partmap_module="$partmap_module part_msdos part_bsd";;
38
+esac
39
+
40
 # Device abstraction module, if any (lvm, raid).
41
 devabstraction_module="`echo "${grub_device}" | xargs "$grub_probe" --device-map="${device_map}" --target=abstraction --device`"
42
 
43
@@ -668,16 +678,28 @@ if [ "x${devabstraction_module}" = "x" ]
44
 	    echo 1>&2
45
 	    hints=
46
         fi
47
+
48
+	if [ x"$force_fs_label" = xy ]; then
49
+            fs_label="`echo "${grub_device}" | xargs "$grub_probe" --device-map="${device_map}" --target=fs_label --device`"
50
+	fi
51
+
52
+	if [ x"$fs_label" != x ]; then
53
+            echo "search.fs_label ${fs_label} root $hints " >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
54
+	    search_module=search_label
55
+	else
56
+
57
 	if [ x"$uuid" != x ]; then
58
             echo "search.fs_uuid ${uuid} root $hints " >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
59
 	    search_module=search_fs_uuid
60
 	else
61
 	    mkdir -p "${grubdir}/uuid"
62
-	    file="`mktemp "${grubdir}/uuid/XXXXXXXXXXXXXXXXXXXXXXXXX"`"
63
+	    file="`mktemp "${grubdir}/uuid/XXXX-XXXX-XXXX"`"
64
 	    relfile="`${grub_mkrelpath} "$file"`"
65
             echo "search.file '${relfile}' root $hints " >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
66
 	    search_module=search_fs_file
67
 	fi
68
+	fi
69
+
70
 	echo 'set prefix=($root)'"$(echo "${relative_grubdir}" | sed "s,\\([ \"'\\\\]\\),\\\\\\1,g")" >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
71
 	config_opt_file="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
72
         modules="$modules $search_module"
(-)sysutils/grub2/pkg-plist (-109 / +173 lines)
Lines 1-56 Link Here
1
%%FUSE%%bin/grub-mount
2
%%FUSE%%man/man1/grub-mount.1.gz
3
%%MKFONT%%bin/grub-mkfont
4
%%MKFONT%%man/man1/grub-mkfont.1.gz
5
%%MKFONT%%share/grub/themes/starfield/dejavu_10.pf2
6
%%MKFONT%%share/grub/themes/starfield/dejavu_12.pf2
7
%%MKFONT%%share/grub/themes/starfield/dejavu_bold_14.pf2
8
%%MKFONT%%share/grub/themes/starfield/dejavu_14.pf2
9
%%MKFONT%%share/grub/themes/starfield/dejavu_16.pf2
10
%%MKFONT%%share/grub/themes/starfield/blob_w.png
11
%%MKFONT%%share/grub/themes/starfield/boot_menu_c.png
12
%%MKFONT%%share/grub/themes/starfield/boot_menu_e.png
13
%%MKFONT%%share/grub/themes/starfield/boot_menu_ne.png
14
%%MKFONT%%share/grub/themes/starfield/boot_menu_n.png
15
%%MKFONT%%share/grub/themes/starfield/boot_menu_nw.png
16
%%MKFONT%%share/grub/themes/starfield/boot_menu_se.png
17
%%MKFONT%%share/grub/themes/starfield/boot_menu_s.png
18
%%MKFONT%%share/grub/themes/starfield/boot_menu_sw.png
19
%%MKFONT%%share/grub/themes/starfield/boot_menu_w.png
20
%%MKFONT%%share/grub/themes/starfield/slider_c.png
21
%%MKFONT%%share/grub/themes/starfield/slider_n.png
22
%%MKFONT%%share/grub/themes/starfield/slider_s.png
23
%%MKFONT%%share/grub/themes/starfield/starfield.png
24
%%MKFONT%%share/grub/themes/starfield/README
25
%%MKFONT%%share/grub/themes/starfield/terminal_box_c.png
26
%%MKFONT%%share/grub/themes/starfield/terminal_box_e.png
27
%%MKFONT%%share/grub/themes/starfield/terminal_box_ne.png
28
%%MKFONT%%share/grub/themes/starfield/terminal_box_n.png
29
%%MKFONT%%share/grub/themes/starfield/terminal_box_nw.png
30
%%MKFONT%%share/grub/themes/starfield/terminal_box_se.png
31
%%MKFONT%%share/grub/themes/starfield/terminal_box_s.png
32
%%MKFONT%%share/grub/themes/starfield/terminal_box_sw.png
33
%%MKFONT%%share/grub/themes/starfield/terminal_box_w.png
34
%%MKFONT%%share/grub/themes/starfield/theme.txt
35
%%MKFONT%%share/grub/themes/starfield/COPYING.CC-BY-SA-3.0
36
bin/grub-editenv
1
bin/grub-editenv
2
bin/grub-file
37
bin/grub-fstest
3
bin/grub-fstest
4
bin/grub-glue-efi
38
bin/grub-kbdcomp
5
bin/grub-kbdcomp
39
bin/grub-menulst2cfg
6
bin/grub-menulst2cfg
7
%%MKFONT%%bin/grub-mkfont
40
bin/grub-mkimage
8
bin/grub-mkimage
41
bin/grub-mklayout
9
bin/grub-mklayout
10
bin/grub-mknetdir
42
bin/grub-mkpasswd-pbkdf2
11
bin/grub-mkpasswd-pbkdf2
43
bin/grub-mkrelpath
12
bin/grub-mkrelpath
13
bin/grub-mkrescue
44
bin/grub-mkstandalone
14
bin/grub-mkstandalone
45
bin/grub-mkrescue
15
bin/grub-render-label
46
bin/grub-script-check
16
bin/grub-script-check
47
etc/grub.d/00_header
17
bin/grub-syslinux2cfg
48
etc/grub.d/30_os-prober
49
etc/grub.d/40_custom
50
etc/grub.d/41_custom
51
etc/grub.d/10_kfreebsd
52
etc/grub.d/README
53
etc/bash_completion.d/grub
18
etc/bash_completion.d/grub
19
%%ETCDIR%%.d/00_header
20
%%ETCDIR%%.d/10_kfreebsd
21
%%ETCDIR%%.d/30_os-prober
22
%%ETCDIR%%.d/40_custom
23
%%ETCDIR%%.d/41_custom
24
%%ETCDIR%%.d/README
54
lib/grub/i386-pc/acpi.mod
25
lib/grub/i386-pc/acpi.mod
55
lib/grub/i386-pc/acpi.module
26
lib/grub/i386-pc/acpi.module
56
lib/grub/i386-pc/adler32.mod
27
lib/grub/i386-pc/adler32.mod
Lines 65-70 Link Here
65
lib/grub/i386-pc/all_video.module
36
lib/grub/i386-pc/all_video.module
66
lib/grub/i386-pc/aout.mod
37
lib/grub/i386-pc/aout.mod
67
lib/grub/i386-pc/aout.module
38
lib/grub/i386-pc/aout.module
39
lib/grub/i386-pc/archelp.mod
40
lib/grub/i386-pc/archelp.module
68
lib/grub/i386-pc/at_keyboard.mod
41
lib/grub/i386-pc/at_keyboard.mod
69
lib/grub/i386-pc/at_keyboard.module
42
lib/grub/i386-pc/at_keyboard.module
70
lib/grub/i386-pc/ata.mod
43
lib/grub/i386-pc/ata.mod
Lines 75-86 Link Here
75
lib/grub/i386-pc/bfs.module
48
lib/grub/i386-pc/bfs.module
76
lib/grub/i386-pc/biosdisk.mod
49
lib/grub/i386-pc/biosdisk.mod
77
lib/grub/i386-pc/biosdisk.module
50
lib/grub/i386-pc/biosdisk.module
51
lib/grub/i386-pc/bitmap_scale.mod
52
lib/grub/i386-pc/bitmap_scale.module
78
lib/grub/i386-pc/bitmap.mod
53
lib/grub/i386-pc/bitmap.mod
79
lib/grub/i386-pc/bitmap.module
54
lib/grub/i386-pc/bitmap.module
80
lib/grub/i386-pc/bitmap_scale.mod
81
lib/grub/i386-pc/bitmap_scale.module
82
lib/grub/i386-pc/blocklist.mod
55
lib/grub/i386-pc/blocklist.mod
83
lib/grub/i386-pc/blocklist.module
56
lib/grub/i386-pc/blocklist.module
57
lib/grub/i386-pc/boot_hybrid.image
58
lib/grub/i386-pc/boot_hybrid.img
84
lib/grub/i386-pc/boot.image
59
lib/grub/i386-pc/boot.image
85
lib/grub/i386-pc/boot.img
60
lib/grub/i386-pc/boot.img
86
lib/grub/i386-pc/boot.mod
61
lib/grub/i386-pc/boot.mod
Lines 87-92 Link Here
87
lib/grub/i386-pc/boot.module
62
lib/grub/i386-pc/boot.module
88
lib/grub/i386-pc/bsd.mod
63
lib/grub/i386-pc/bsd.mod
89
lib/grub/i386-pc/bsd.module
64
lib/grub/i386-pc/bsd.module
65
lib/grub/i386-pc/bswap_test.mod
66
lib/grub/i386-pc/bswap_test.module
90
lib/grub/i386-pc/btrfs.mod
67
lib/grub/i386-pc/btrfs.mod
91
lib/grub/i386-pc/btrfs.module
68
lib/grub/i386-pc/btrfs.module
92
lib/grub/i386-pc/bufio.mod
69
lib/grub/i386-pc/bufio.mod
Lines 93-104 Link Here
93
lib/grub/i386-pc/bufio.module
70
lib/grub/i386-pc/bufio.module
94
lib/grub/i386-pc/cat.mod
71
lib/grub/i386-pc/cat.mod
95
lib/grub/i386-pc/cat.module
72
lib/grub/i386-pc/cat.module
73
lib/grub/i386-pc/cbfs.mod
74
lib/grub/i386-pc/cbfs.module
75
lib/grub/i386-pc/cbls.mod
76
lib/grub/i386-pc/cbls.module
77
lib/grub/i386-pc/cbmemc.mod
78
lib/grub/i386-pc/cbmemc.module
79
lib/grub/i386-pc/cbtable.mod
80
lib/grub/i386-pc/cbtable.module
81
lib/grub/i386-pc/cbtime.mod
82
lib/grub/i386-pc/cbtime.module
96
lib/grub/i386-pc/cdboot.image
83
lib/grub/i386-pc/cdboot.image
97
lib/grub/i386-pc/cdboot.img
84
lib/grub/i386-pc/cdboot.img
98
lib/grub/i386-pc/chain.mod
85
lib/grub/i386-pc/chain.mod
99
lib/grub/i386-pc/chain.module
86
lib/grub/i386-pc/chain.module
87
lib/grub/i386-pc/cmdline_cat_test.mod
88
lib/grub/i386-pc/cmdline_cat_test.module
89
lib/grub/i386-pc/cmosdump.mod
90
lib/grub/i386-pc/cmosdump.module
100
lib/grub/i386-pc/cmostest.mod
91
lib/grub/i386-pc/cmostest.mod
101
lib/grub/i386-pc/cmostest.module
92
lib/grub/i386-pc/cmostest.module
93
lib/grub/i386-pc/cmp_test.mod
94
lib/grub/i386-pc/cmp_test.module
102
lib/grub/i386-pc/cmp.mod
95
lib/grub/i386-pc/cmp.mod
103
lib/grub/i386-pc/cmp.module
96
lib/grub/i386-pc/cmp.module
104
lib/grub/i386-pc/command.lst
97
lib/grub/i386-pc/command.lst
Lines 105-114 Link Here
105
lib/grub/i386-pc/config.h
98
lib/grub/i386-pc/config.h
106
lib/grub/i386-pc/configfile.mod
99
lib/grub/i386-pc/configfile.mod
107
lib/grub/i386-pc/configfile.module
100
lib/grub/i386-pc/configfile.module
101
lib/grub/i386-pc/cpio_be.mod
102
lib/grub/i386-pc/cpio_be.module
108
lib/grub/i386-pc/cpio.mod
103
lib/grub/i386-pc/cpio.mod
109
lib/grub/i386-pc/cpio.module
104
lib/grub/i386-pc/cpio.module
110
lib/grub/i386-pc/cpio_be.mod
111
lib/grub/i386-pc/cpio_be.module
112
lib/grub/i386-pc/cpuid.mod
105
lib/grub/i386-pc/cpuid.mod
113
lib/grub/i386-pc/cpuid.module
106
lib/grub/i386-pc/cpuid.module
114
lib/grub/i386-pc/crc64.mod
107
lib/grub/i386-pc/crc64.mod
Lines 120-125 Link Here
120
lib/grub/i386-pc/cryptodisk.module
113
lib/grub/i386-pc/cryptodisk.module
121
lib/grub/i386-pc/cs5536.mod
114
lib/grub/i386-pc/cs5536.mod
122
lib/grub/i386-pc/cs5536.module
115
lib/grub/i386-pc/cs5536.module
116
lib/grub/i386-pc/ctz_test.mod
117
lib/grub/i386-pc/ctz_test.module
123
lib/grub/i386-pc/date.mod
118
lib/grub/i386-pc/date.mod
124
lib/grub/i386-pc/date.module
119
lib/grub/i386-pc/date.module
125
lib/grub/i386-pc/datehook.mod
120
lib/grub/i386-pc/datehook.mod
Lines 126-135 Link Here
126
lib/grub/i386-pc/datehook.module
121
lib/grub/i386-pc/datehook.module
127
lib/grub/i386-pc/datetime.mod
122
lib/grub/i386-pc/datetime.mod
128
lib/grub/i386-pc/datetime.module
123
lib/grub/i386-pc/datetime.module
124
lib/grub/i386-pc/disk.mod
125
lib/grub/i386-pc/disk.module
129
lib/grub/i386-pc/diskboot.image
126
lib/grub/i386-pc/diskboot.image
130
lib/grub/i386-pc/diskboot.img
127
lib/grub/i386-pc/diskboot.img
131
lib/grub/i386-pc/diskfilter.mod
128
lib/grub/i386-pc/diskfilter.mod
132
lib/grub/i386-pc/diskfilter.module
129
lib/grub/i386-pc/diskfilter.module
130
lib/grub/i386-pc/div_test.mod
131
lib/grub/i386-pc/div_test.module
132
lib/grub/i386-pc/div.mod
133
lib/grub/i386-pc/div.module
133
lib/grub/i386-pc/dm_nv.mod
134
lib/grub/i386-pc/dm_nv.mod
134
lib/grub/i386-pc/dm_nv.module
135
lib/grub/i386-pc/dm_nv.module
135
lib/grub/i386-pc/drivemap.mod
136
lib/grub/i386-pc/drivemap.mod
Lines 144-149 Link Here
144
lib/grub/i386-pc/ehci.module
145
lib/grub/i386-pc/ehci.module
145
lib/grub/i386-pc/elf.mod
146
lib/grub/i386-pc/elf.mod
146
lib/grub/i386-pc/elf.module
147
lib/grub/i386-pc/elf.module
148
lib/grub/i386-pc/eval.mod
149
lib/grub/i386-pc/eval.module
147
lib/grub/i386-pc/exfat.mod
150
lib/grub/i386-pc/exfat.mod
148
lib/grub/i386-pc/exfat.module
151
lib/grub/i386-pc/exfat.module
149
lib/grub/i386-pc/exfctest.mod
152
lib/grub/i386-pc/exfctest.mod
Lines 152-159 Link Here
152
lib/grub/i386-pc/ext2.module
155
lib/grub/i386-pc/ext2.module
153
lib/grub/i386-pc/extcmd.mod
156
lib/grub/i386-pc/extcmd.mod
154
lib/grub/i386-pc/extcmd.module
157
lib/grub/i386-pc/extcmd.module
158
lib/grub/i386-pc/f2fs.mod
159
lib/grub/i386-pc/f2fs.module
155
lib/grub/i386-pc/fat.mod
160
lib/grub/i386-pc/fat.mod
156
lib/grub/i386-pc/fat.module
161
lib/grub/i386-pc/fat.module
162
lib/grub/i386-pc/fdt.lst
163
lib/grub/i386-pc/file.mod
164
lib/grub/i386-pc/file.module
157
lib/grub/i386-pc/font.mod
165
lib/grub/i386-pc/font.mod
158
lib/grub/i386-pc/font.module
166
lib/grub/i386-pc/font.module
159
lib/grub/i386-pc/freedos.mod
167
lib/grub/i386-pc/freedos.mod
Lines 175-180 Link Here
175
lib/grub/i386-pc/gcry_crc.module
183
lib/grub/i386-pc/gcry_crc.module
176
lib/grub/i386-pc/gcry_des.mod
184
lib/grub/i386-pc/gcry_des.mod
177
lib/grub/i386-pc/gcry_des.module
185
lib/grub/i386-pc/gcry_des.module
186
lib/grub/i386-pc/gcry_dsa.mod
187
lib/grub/i386-pc/gcry_dsa.module
188
lib/grub/i386-pc/gcry_idea.mod
189
lib/grub/i386-pc/gcry_idea.module
178
lib/grub/i386-pc/gcry_md4.mod
190
lib/grub/i386-pc/gcry_md4.mod
179
lib/grub/i386-pc/gcry_md4.module
191
lib/grub/i386-pc/gcry_md4.module
180
lib/grub/i386-pc/gcry_md5.mod
192
lib/grub/i386-pc/gcry_md5.mod
Lines 185-190 Link Here
185
lib/grub/i386-pc/gcry_rijndael.module
197
lib/grub/i386-pc/gcry_rijndael.module
186
lib/grub/i386-pc/gcry_rmd160.mod
198
lib/grub/i386-pc/gcry_rmd160.mod
187
lib/grub/i386-pc/gcry_rmd160.module
199
lib/grub/i386-pc/gcry_rmd160.module
200
lib/grub/i386-pc/gcry_rsa.mod
201
lib/grub/i386-pc/gcry_rsa.module
188
lib/grub/i386-pc/gcry_seed.mod
202
lib/grub/i386-pc/gcry_seed.mod
189
lib/grub/i386-pc/gcry_seed.module
203
lib/grub/i386-pc/gcry_seed.module
190
lib/grub/i386-pc/gcry_serpent.mod
204
lib/grub/i386-pc/gcry_serpent.mod
Lines 201-209 Link Here
201
lib/grub/i386-pc/gcry_twofish.module
215
lib/grub/i386-pc/gcry_twofish.module
202
lib/grub/i386-pc/gcry_whirlpool.mod
216
lib/grub/i386-pc/gcry_whirlpool.mod
203
lib/grub/i386-pc/gcry_whirlpool.module
217
lib/grub/i386-pc/gcry_whirlpool.module
218
lib/grub/i386-pc/gdb_grub
204
lib/grub/i386-pc/gdb.mod
219
lib/grub/i386-pc/gdb.mod
205
lib/grub/i386-pc/gdb.module
220
lib/grub/i386-pc/gdb.module
206
lib/grub/i386-pc/gdb_grub
207
lib/grub/i386-pc/geli.mod
221
lib/grub/i386-pc/geli.mod
208
lib/grub/i386-pc/geli.module
222
lib/grub/i386-pc/geli.module
209
lib/grub/i386-pc/gettext.mod
223
lib/grub/i386-pc/gettext.mod
Lines 210-215 Link Here
210
lib/grub/i386-pc/gettext.module
224
lib/grub/i386-pc/gettext.module
211
lib/grub/i386-pc/gfxmenu.mod
225
lib/grub/i386-pc/gfxmenu.mod
212
lib/grub/i386-pc/gfxmenu.module
226
lib/grub/i386-pc/gfxmenu.module
227
lib/grub/i386-pc/gfxterm_background.mod
228
lib/grub/i386-pc/gfxterm_background.module
229
lib/grub/i386-pc/gfxterm_menu.mod
230
lib/grub/i386-pc/gfxterm_menu.module
213
lib/grub/i386-pc/gfxterm.mod
231
lib/grub/i386-pc/gfxterm.mod
214
lib/grub/i386-pc/gfxterm.module
232
lib/grub/i386-pc/gfxterm.module
215
lib/grub/i386-pc/gmodule.pl
233
lib/grub/i386-pc/gmodule.pl
Lines 233-238 Link Here
233
lib/grub/i386-pc/hfs.module
251
lib/grub/i386-pc/hfs.module
234
lib/grub/i386-pc/hfsplus.mod
252
lib/grub/i386-pc/hfsplus.mod
235
lib/grub/i386-pc/hfsplus.module
253
lib/grub/i386-pc/hfsplus.module
254
lib/grub/i386-pc/hfspluscomp.mod
255
lib/grub/i386-pc/hfspluscomp.module
236
lib/grub/i386-pc/http.mod
256
lib/grub/i386-pc/http.mod
237
lib/grub/i386-pc/http.module
257
lib/grub/i386-pc/http.module
238
lib/grub/i386-pc/iorw.mod
258
lib/grub/i386-pc/iorw.mod
Lines 251-256 Link Here
251
lib/grub/i386-pc/keystatus.module
271
lib/grub/i386-pc/keystatus.module
252
lib/grub/i386-pc/ldm.mod
272
lib/grub/i386-pc/ldm.mod
253
lib/grub/i386-pc/ldm.module
273
lib/grub/i386-pc/ldm.module
274
lib/grub/i386-pc/legacy_password_test.mod
275
lib/grub/i386-pc/legacy_password_test.module
254
lib/grub/i386-pc/legacycfg.mod
276
lib/grub/i386-pc/legacycfg.mod
255
lib/grub/i386-pc/legacycfg.module
277
lib/grub/i386-pc/legacycfg.module
256
lib/grub/i386-pc/linux.mod
278
lib/grub/i386-pc/linux.mod
Lines 281-290 Link Here
281
lib/grub/i386-pc/lzma_decompress.img
303
lib/grub/i386-pc/lzma_decompress.img
282
lib/grub/i386-pc/lzopio.mod
304
lib/grub/i386-pc/lzopio.mod
283
lib/grub/i386-pc/lzopio.module
305
lib/grub/i386-pc/lzopio.module
306
lib/grub/i386-pc/macbless.mod
307
lib/grub/i386-pc/macbless.module
308
lib/grub/i386-pc/macho.mod
309
lib/grub/i386-pc/macho.module
310
lib/grub/i386-pc/mda_text.mod
311
lib/grub/i386-pc/mda_text.module
312
lib/grub/i386-pc/mdraid09_be.mod
313
lib/grub/i386-pc/mdraid09_be.module
284
lib/grub/i386-pc/mdraid09.mod
314
lib/grub/i386-pc/mdraid09.mod
285
lib/grub/i386-pc/mdraid09.module
315
lib/grub/i386-pc/mdraid09.module
286
lib/grub/i386-pc/mdraid09_be.mod
287
lib/grub/i386-pc/mdraid09_be.module
288
lib/grub/i386-pc/mdraid1x.mod
316
lib/grub/i386-pc/mdraid1x.mod
289
lib/grub/i386-pc/mdraid1x.module
317
lib/grub/i386-pc/mdraid1x.module
290
lib/grub/i386-pc/memdisk.mod
318
lib/grub/i386-pc/memdisk.mod
Lines 293-320 Link Here
293
lib/grub/i386-pc/memrw.module
321
lib/grub/i386-pc/memrw.module
294
lib/grub/i386-pc/minicmd.mod
322
lib/grub/i386-pc/minicmd.mod
295
lib/grub/i386-pc/minicmd.module
323
lib/grub/i386-pc/minicmd.module
324
lib/grub/i386-pc/minix_be.mod
325
lib/grub/i386-pc/minix_be.module
296
lib/grub/i386-pc/minix.mod
326
lib/grub/i386-pc/minix.mod
297
lib/grub/i386-pc/minix.module
327
lib/grub/i386-pc/minix.module
328
lib/grub/i386-pc/minix2_be.mod
329
lib/grub/i386-pc/minix2_be.module
298
lib/grub/i386-pc/minix2.mod
330
lib/grub/i386-pc/minix2.mod
299
lib/grub/i386-pc/minix2.module
331
lib/grub/i386-pc/minix2.module
300
lib/grub/i386-pc/minix2_be.mod
332
lib/grub/i386-pc/minix3_be.mod
301
lib/grub/i386-pc/minix2_be.module
333
lib/grub/i386-pc/minix3_be.module
302
lib/grub/i386-pc/minix3.mod
334
lib/grub/i386-pc/minix3.mod
303
lib/grub/i386-pc/minix3.module
335
lib/grub/i386-pc/minix3.module
304
lib/grub/i386-pc/minix3_be.mod
305
lib/grub/i386-pc/minix3_be.module
306
lib/grub/i386-pc/minix_be.mod
307
lib/grub/i386-pc/minix_be.module
308
lib/grub/i386-pc/mmap.mod
336
lib/grub/i386-pc/mmap.mod
309
lib/grub/i386-pc/mmap.module
337
lib/grub/i386-pc/mmap.module
310
lib/grub/i386-pc/moddep.lst
338
lib/grub/i386-pc/moddep.lst
311
lib/grub/i386-pc/modinfo.sh
339
lib/grub/i386-pc/modinfo.sh
340
lib/grub/i386-pc/morse.mod
341
lib/grub/i386-pc/morse.module
342
lib/grub/i386-pc/mpi.mod
343
lib/grub/i386-pc/mpi.module
312
lib/grub/i386-pc/msdospart.mod
344
lib/grub/i386-pc/msdospart.mod
313
lib/grub/i386-pc/msdospart.module
345
lib/grub/i386-pc/msdospart.module
346
lib/grub/i386-pc/mul_test.mod
347
lib/grub/i386-pc/mul_test.module
314
lib/grub/i386-pc/multiboot.mod
348
lib/grub/i386-pc/multiboot.mod
315
lib/grub/i386-pc/multiboot.module
349
lib/grub/i386-pc/multiboot.module
316
lib/grub/i386-pc/multiboot2.mod
350
lib/grub/i386-pc/multiboot2.mod
317
lib/grub/i386-pc/multiboot2.module
351
lib/grub/i386-pc/multiboot2.module
352
lib/grub/i386-pc/nativedisk.mod
353
lib/grub/i386-pc/nativedisk.module
318
lib/grub/i386-pc/net.mod
354
lib/grub/i386-pc/net.mod
319
lib/grub/i386-pc/net.module
355
lib/grub/i386-pc/net.module
320
lib/grub/i386-pc/newc.mod
356
lib/grub/i386-pc/newc.mod
Lines 331-336 Link Here
331
lib/grub/i386-pc/ntldr.module
367
lib/grub/i386-pc/ntldr.module
332
lib/grub/i386-pc/odc.mod
368
lib/grub/i386-pc/odc.mod
333
lib/grub/i386-pc/odc.module
369
lib/grub/i386-pc/odc.module
370
lib/grub/i386-pc/offsetio.mod
371
lib/grub/i386-pc/offsetio.module
334
lib/grub/i386-pc/ohci.mod
372
lib/grub/i386-pc/ohci.mod
335
lib/grub/i386-pc/ohci.module
373
lib/grub/i386-pc/ohci.module
336
lib/grub/i386-pc/part_acorn.mod
374
lib/grub/i386-pc/part_acorn.mod
Lines 341-346 Link Here
341
lib/grub/i386-pc/part_apple.module
379
lib/grub/i386-pc/part_apple.module
342
lib/grub/i386-pc/part_bsd.mod
380
lib/grub/i386-pc/part_bsd.mod
343
lib/grub/i386-pc/part_bsd.module
381
lib/grub/i386-pc/part_bsd.module
382
lib/grub/i386-pc/part_dfly.mod
383
lib/grub/i386-pc/part_dfly.module
344
lib/grub/i386-pc/part_dvh.mod
384
lib/grub/i386-pc/part_dvh.mod
345
lib/grub/i386-pc/part_dvh.module
385
lib/grub/i386-pc/part_dvh.module
346
lib/grub/i386-pc/part_gpt.mod
386
lib/grub/i386-pc/part_gpt.mod
Lines 357-372 Link Here
357
lib/grub/i386-pc/parttool.lst
397
lib/grub/i386-pc/parttool.lst
358
lib/grub/i386-pc/parttool.mod
398
lib/grub/i386-pc/parttool.mod
359
lib/grub/i386-pc/parttool.module
399
lib/grub/i386-pc/parttool.module
400
lib/grub/i386-pc/password_pbkdf2.mod
401
lib/grub/i386-pc/password_pbkdf2.module
360
lib/grub/i386-pc/password.mod
402
lib/grub/i386-pc/password.mod
361
lib/grub/i386-pc/password.module
403
lib/grub/i386-pc/password.module
362
lib/grub/i386-pc/password_pbkdf2.mod
363
lib/grub/i386-pc/password_pbkdf2.module
364
lib/grub/i386-pc/pata.mod
404
lib/grub/i386-pc/pata.mod
365
lib/grub/i386-pc/pata.module
405
lib/grub/i386-pc/pata.module
406
lib/grub/i386-pc/pbkdf2_test.mod
407
lib/grub/i386-pc/pbkdf2_test.module
366
lib/grub/i386-pc/pbkdf2.mod
408
lib/grub/i386-pc/pbkdf2.mod
367
lib/grub/i386-pc/pbkdf2.module
409
lib/grub/i386-pc/pbkdf2.module
368
lib/grub/i386-pc/pci.mod
410
lib/grub/i386-pc/pci.mod
369
lib/grub/i386-pc/pci.module
411
lib/grub/i386-pc/pci.module
412
lib/grub/i386-pc/pcidump.mod
413
lib/grub/i386-pc/pcidump.module
414
lib/grub/i386-pc/pgp.mod
415
lib/grub/i386-pc/pgp.module
370
lib/grub/i386-pc/plan9.mod
416
lib/grub/i386-pc/plan9.mod
371
lib/grub/i386-pc/plan9.module
417
lib/grub/i386-pc/plan9.module
372
lib/grub/i386-pc/play.mod
418
lib/grub/i386-pc/play.mod
Lines 377-382 Link Here
377
lib/grub/i386-pc/priority_queue.module
423
lib/grub/i386-pc/priority_queue.module
378
lib/grub/i386-pc/probe.mod
424
lib/grub/i386-pc/probe.mod
379
lib/grub/i386-pc/probe.module
425
lib/grub/i386-pc/probe.module
426
lib/grub/i386-pc/procfs.mod
427
lib/grub/i386-pc/procfs.module
428
lib/grub/i386-pc/progress.mod
429
lib/grub/i386-pc/progress.module
380
lib/grub/i386-pc/pxe.mod
430
lib/grub/i386-pc/pxe.mod
381
lib/grub/i386-pc/pxe.module
431
lib/grub/i386-pc/pxe.module
382
lib/grub/i386-pc/pxeboot.image
432
lib/grub/i386-pc/pxeboot.image
Lines 387-392 Link Here
387
lib/grub/i386-pc/raid5rec.module
437
lib/grub/i386-pc/raid5rec.module
388
lib/grub/i386-pc/raid6rec.mod
438
lib/grub/i386-pc/raid6rec.mod
389
lib/grub/i386-pc/raid6rec.module
439
lib/grub/i386-pc/raid6rec.module
440
lib/grub/i386-pc/random.mod
441
lib/grub/i386-pc/random.module
390
lib/grub/i386-pc/read.mod
442
lib/grub/i386-pc/read.mod
391
lib/grub/i386-pc/read.module
443
lib/grub/i386-pc/read.module
392
lib/grub/i386-pc/reboot.mod
444
lib/grub/i386-pc/reboot.mod
Lines 401-408 Link Here
401
lib/grub/i386-pc/romfs.module
453
lib/grub/i386-pc/romfs.module
402
lib/grub/i386-pc/scsi.mod
454
lib/grub/i386-pc/scsi.mod
403
lib/grub/i386-pc/scsi.module
455
lib/grub/i386-pc/scsi.module
404
lib/grub/i386-pc/search.mod
405
lib/grub/i386-pc/search.module
406
lib/grub/i386-pc/search_fs_file.mod
456
lib/grub/i386-pc/search_fs_file.mod
407
lib/grub/i386-pc/search_fs_file.module
457
lib/grub/i386-pc/search_fs_file.module
408
lib/grub/i386-pc/search_fs_uuid.mod
458
lib/grub/i386-pc/search_fs_uuid.mod
Lines 409-418 Link Here
409
lib/grub/i386-pc/search_fs_uuid.module
459
lib/grub/i386-pc/search_fs_uuid.module
410
lib/grub/i386-pc/search_label.mod
460
lib/grub/i386-pc/search_label.mod
411
lib/grub/i386-pc/search_label.module
461
lib/grub/i386-pc/search_label.module
462
lib/grub/i386-pc/search.mod
463
lib/grub/i386-pc/search.module
412
lib/grub/i386-pc/sendkey.mod
464
lib/grub/i386-pc/sendkey.mod
413
lib/grub/i386-pc/sendkey.module
465
lib/grub/i386-pc/sendkey.module
414
lib/grub/i386-pc/serial.mod
466
lib/grub/i386-pc/serial.mod
415
lib/grub/i386-pc/serial.module
467
lib/grub/i386-pc/serial.module
468
lib/grub/i386-pc/setjmp_test.mod
469
lib/grub/i386-pc/setjmp_test.module
416
lib/grub/i386-pc/setjmp.mod
470
lib/grub/i386-pc/setjmp.mod
417
lib/grub/i386-pc/setjmp.module
471
lib/grub/i386-pc/setjmp.module
418
lib/grub/i386-pc/setpci.mod
472
lib/grub/i386-pc/setpci.mod
Lines 419-428 Link Here
419
lib/grub/i386-pc/setpci.module
473
lib/grub/i386-pc/setpci.module
420
lib/grub/i386-pc/sfs.mod
474
lib/grub/i386-pc/sfs.mod
421
lib/grub/i386-pc/sfs.module
475
lib/grub/i386-pc/sfs.module
476
lib/grub/i386-pc/shift_test.mod
477
lib/grub/i386-pc/shift_test.module
478
lib/grub/i386-pc/signature_test.mod
479
lib/grub/i386-pc/signature_test.module
480
lib/grub/i386-pc/sleep_test.mod
481
lib/grub/i386-pc/sleep_test.module
422
lib/grub/i386-pc/sleep.mod
482
lib/grub/i386-pc/sleep.mod
423
lib/grub/i386-pc/sleep.module
483
lib/grub/i386-pc/sleep.module
484
lib/grub/i386-pc/spkmodem.mod
485
lib/grub/i386-pc/spkmodem.module
424
lib/grub/i386-pc/squash4.mod
486
lib/grub/i386-pc/squash4.mod
425
lib/grub/i386-pc/squash4.module
487
lib/grub/i386-pc/squash4.module
488
lib/grub/i386-pc/strtoull_test.mod
489
lib/grub/i386-pc/strtoull_test.module
490
lib/grub/i386-pc/syslinuxcfg.mod
491
lib/grub/i386-pc/syslinuxcfg.module
426
lib/grub/i386-pc/tar.mod
492
lib/grub/i386-pc/tar.mod
427
lib/grub/i386-pc/tar.module
493
lib/grub/i386-pc/tar.module
428
lib/grub/i386-pc/terminal.lst
494
lib/grub/i386-pc/terminal.lst
Lines 430-441 Link Here
430
lib/grub/i386-pc/terminal.module
496
lib/grub/i386-pc/terminal.module
431
lib/grub/i386-pc/terminfo.mod
497
lib/grub/i386-pc/terminfo.mod
432
lib/grub/i386-pc/terminfo.module
498
lib/grub/i386-pc/terminfo.module
499
lib/grub/i386-pc/test_blockarg.mod
500
lib/grub/i386-pc/test_blockarg.module
433
lib/grub/i386-pc/test.mod
501
lib/grub/i386-pc/test.mod
434
lib/grub/i386-pc/test.module
502
lib/grub/i386-pc/test.module
435
lib/grub/i386-pc/test_blockarg.mod
436
lib/grub/i386-pc/test_blockarg.module
437
lib/grub/i386-pc/testload.mod
503
lib/grub/i386-pc/testload.mod
438
lib/grub/i386-pc/testload.module
504
lib/grub/i386-pc/testload.module
505
lib/grub/i386-pc/testspeed.mod
506
lib/grub/i386-pc/testspeed.module
439
lib/grub/i386-pc/tftp.mod
507
lib/grub/i386-pc/tftp.mod
440
lib/grub/i386-pc/tftp.module
508
lib/grub/i386-pc/tftp.module
441
lib/grub/i386-pc/tga.mod
509
lib/grub/i386-pc/tga.mod
Lines 442-453 Link Here
442
lib/grub/i386-pc/tga.module
510
lib/grub/i386-pc/tga.module
443
lib/grub/i386-pc/time.mod
511
lib/grub/i386-pc/time.mod
444
lib/grub/i386-pc/time.module
512
lib/grub/i386-pc/time.module
513
lib/grub/i386-pc/tr.mod
514
lib/grub/i386-pc/tr.module
445
lib/grub/i386-pc/trig.mod
515
lib/grub/i386-pc/trig.mod
446
lib/grub/i386-pc/trig.module
516
lib/grub/i386-pc/trig.module
447
lib/grub/i386-pc/true.mod
517
lib/grub/i386-pc/true.mod
448
lib/grub/i386-pc/true.module
518
lib/grub/i386-pc/true.module
519
lib/grub/i386-pc/truecrypt.mod
520
lib/grub/i386-pc/truecrypt.module
449
lib/grub/i386-pc/udf.mod
521
lib/grub/i386-pc/udf.mod
450
lib/grub/i386-pc/udf.module
522
lib/grub/i386-pc/udf.module
523
lib/grub/i386-pc/ufs1_be.mod
524
lib/grub/i386-pc/ufs1_be.module
451
lib/grub/i386-pc/ufs1.mod
525
lib/grub/i386-pc/ufs1.mod
452
lib/grub/i386-pc/ufs1.module
526
lib/grub/i386-pc/ufs1.module
453
lib/grub/i386-pc/ufs2.mod
527
lib/grub/i386-pc/ufs2.mod
Lines 454-463 Link Here
454
lib/grub/i386-pc/ufs2.module
528
lib/grub/i386-pc/ufs2.module
455
lib/grub/i386-pc/uhci.mod
529
lib/grub/i386-pc/uhci.mod
456
lib/grub/i386-pc/uhci.module
530
lib/grub/i386-pc/uhci.module
531
lib/grub/i386-pc/usb_keyboard.mod
532
lib/grub/i386-pc/usb_keyboard.module
457
lib/grub/i386-pc/usb.mod
533
lib/grub/i386-pc/usb.mod
458
lib/grub/i386-pc/usb.module
534
lib/grub/i386-pc/usb.module
459
lib/grub/i386-pc/usb_keyboard.mod
460
lib/grub/i386-pc/usb_keyboard.module
461
lib/grub/i386-pc/usbms.mod
535
lib/grub/i386-pc/usbms.mod
462
lib/grub/i386-pc/usbms.module
536
lib/grub/i386-pc/usbms.module
463
lib/grub/i386-pc/usbserial_common.mod
537
lib/grub/i386-pc/usbserial_common.mod
Lines 466-498 Link Here
466
lib/grub/i386-pc/usbserial_ftdi.module
540
lib/grub/i386-pc/usbserial_ftdi.module
467
lib/grub/i386-pc/usbserial_pl2303.mod
541
lib/grub/i386-pc/usbserial_pl2303.mod
468
lib/grub/i386-pc/usbserial_pl2303.module
542
lib/grub/i386-pc/usbserial_pl2303.module
543
lib/grub/i386-pc/usbserial_usbdebug.mod
544
lib/grub/i386-pc/usbserial_usbdebug.module
469
lib/grub/i386-pc/usbtest.mod
545
lib/grub/i386-pc/usbtest.mod
470
lib/grub/i386-pc/usbtest.module
546
lib/grub/i386-pc/usbtest.module
471
lib/grub/i386-pc/vbe.mod
547
lib/grub/i386-pc/vbe.mod
472
lib/grub/i386-pc/vbe.module
548
lib/grub/i386-pc/vbe.module
549
lib/grub/i386-pc/verifiers.mod
550
lib/grub/i386-pc/verifiers.module
551
lib/grub/i386-pc/vga_text.mod
552
lib/grub/i386-pc/vga_text.module
473
lib/grub/i386-pc/vga.mod
553
lib/grub/i386-pc/vga.mod
474
lib/grub/i386-pc/vga.module
554
lib/grub/i386-pc/vga.module
475
lib/grub/i386-pc/vga_text.mod
476
lib/grub/i386-pc/vga_text.module
477
lib/grub/i386-pc/video.lst
478
lib/grub/i386-pc/video.mod
479
lib/grub/i386-pc/video.module
480
lib/grub/i386-pc/video_bochs.mod
555
lib/grub/i386-pc/video_bochs.mod
481
lib/grub/i386-pc/video_bochs.module
556
lib/grub/i386-pc/video_bochs.module
482
lib/grub/i386-pc/video_cirrus.mod
557
lib/grub/i386-pc/video_cirrus.mod
483
lib/grub/i386-pc/video_cirrus.module
558
lib/grub/i386-pc/video_cirrus.module
559
lib/grub/i386-pc/video_colors.mod
560
lib/grub/i386-pc/video_colors.module
484
lib/grub/i386-pc/video_fb.mod
561
lib/grub/i386-pc/video_fb.mod
485
lib/grub/i386-pc/video_fb.module
562
lib/grub/i386-pc/video_fb.module
563
lib/grub/i386-pc/video.lst
564
lib/grub/i386-pc/video.mod
565
lib/grub/i386-pc/video.module
486
lib/grub/i386-pc/videoinfo.mod
566
lib/grub/i386-pc/videoinfo.mod
487
lib/grub/i386-pc/videoinfo.module
567
lib/grub/i386-pc/videoinfo.module
568
lib/grub/i386-pc/videotest_checksum.mod
569
lib/grub/i386-pc/videotest_checksum.module
488
lib/grub/i386-pc/videotest.mod
570
lib/grub/i386-pc/videotest.mod
489
lib/grub/i386-pc/videotest.module
571
lib/grub/i386-pc/videotest.module
490
lib/grub/i386-pc/xfs.mod
572
lib/grub/i386-pc/xfs.mod
491
lib/grub/i386-pc/xfs.module
573
lib/grub/i386-pc/xfs.module
574
lib/grub/i386-pc/xnu_uuid_test.mod
575
lib/grub/i386-pc/xnu_uuid_test.module
576
lib/grub/i386-pc/xnu_uuid.mod
577
lib/grub/i386-pc/xnu_uuid.module
492
lib/grub/i386-pc/xnu.mod
578
lib/grub/i386-pc/xnu.mod
493
lib/grub/i386-pc/xnu.module
579
lib/grub/i386-pc/xnu.module
494
lib/grub/i386-pc/xnu_uuid.mod
495
lib/grub/i386-pc/xnu_uuid.module
496
lib/grub/i386-pc/xzio.mod
580
lib/grub/i386-pc/xzio.mod
497
lib/grub/i386-pc/xzio.module
581
lib/grub/i386-pc/xzio.module
498
lib/grub/i386-pc/zfs.mod
582
lib/grub/i386-pc/zfs.mod
Lines 501-561 Link Here
501
lib/grub/i386-pc/zfscrypt.module
585
lib/grub/i386-pc/zfscrypt.module
502
lib/grub/i386-pc/zfsinfo.mod
586
lib/grub/i386-pc/zfsinfo.mod
503
lib/grub/i386-pc/zfsinfo.module
587
lib/grub/i386-pc/zfsinfo.module
504
sbin/grub-bios-setup
588
lib/grub/i386-pc/zstd.mod
505
sbin/grub-probe
589
lib/grub/i386-pc/zstd.module
506
sbin/grub-install
507
sbin/grub-mkconfig
508
sbin/grub-mknetdir
509
sbin/grub-ofpathname
510
sbin/grub-set-default
511
sbin/grub-sparc64-setup
512
sbin/grub-reboot
513
share/grub/grub-mkconfig_lib
514
share/locale/ast/LC_MESSAGES/grub.mo
515
share/locale/ca/LC_MESSAGES/grub.mo
516
share/locale/da/LC_MESSAGES/grub.mo
517
share/locale/de/LC_MESSAGES/grub.mo
518
share/locale/de@hebrew/LC_MESSAGES/grub.mo
519
share/locale/de_CH/LC_MESSAGES/grub.mo
520
share/locale/en@arabic/LC_MESSAGES/grub.mo
521
share/locale/en@cyrillic/LC_MESSAGES/grub.mo
522
share/locale/en@greek/LC_MESSAGES/grub.mo
523
share/locale/en@hebrew/LC_MESSAGES/grub.mo
524
share/locale/en@piglatin/LC_MESSAGES/grub.mo
525
share/locale/en@quot/LC_MESSAGES/grub.mo
526
share/locale/eo/LC_MESSAGES/grub.mo
527
share/locale/fi/LC_MESSAGES/grub.mo
528
share/locale/fr/LC_MESSAGES/grub.mo
529
share/locale/hu/LC_MESSAGES/grub.mo
530
share/locale/id/LC_MESSAGES/grub.mo
531
share/locale/it/LC_MESSAGES/grub.mo
532
share/locale/ja/LC_MESSAGES/grub.mo
533
share/locale/nl/LC_MESSAGES/grub.mo
534
share/locale/pa/LC_MESSAGES/grub.mo
535
share/locale/pl/LC_MESSAGES/grub.mo
536
share/locale/ru/LC_MESSAGES/grub.mo
537
share/locale/sv/LC_MESSAGES/grub.mo
538
share/locale/uk/LC_MESSAGES/grub.mo
539
share/locale/vi/LC_MESSAGES/grub.mo
540
share/locale/zh_CN/LC_MESSAGES/grub.mo
541
share/locale/zh_TW/LC_MESSAGES/grub.mo
542
man/man1/grub-editenv.1.gz
590
man/man1/grub-editenv.1.gz
591
man/man1/grub-file.1.gz
543
man/man1/grub-fstest.1.gz
592
man/man1/grub-fstest.1.gz
593
man/man1/grub-glue-efi.1.gz
544
man/man1/grub-kbdcomp.1.gz
594
man/man1/grub-kbdcomp.1.gz
545
man/man1/grub-menulst2cfg.1.gz
595
man/man1/grub-menulst2cfg.1.gz
596
%%MKFONT%%man/man1/grub-mkfont.1.gz
546
man/man1/grub-mkimage.1.gz
597
man/man1/grub-mkimage.1.gz
547
man/man1/grub-mklayout.1.gz
598
man/man1/grub-mklayout.1.gz
599
man/man1/grub-mknetdir.1.gz
548
man/man1/grub-mkpasswd-pbkdf2.1.gz
600
man/man1/grub-mkpasswd-pbkdf2.1.gz
549
man/man1/grub-mkrelpath.1.gz
601
man/man1/grub-mkrelpath.1.gz
550
man/man1/grub-mkrescue.1.gz
602
man/man1/grub-mkrescue.1.gz
551
man/man1/grub-mkstandalone.1.gz
603
man/man1/grub-mkstandalone.1.gz
604
man/man1/grub-render-label.1.gz
552
man/man1/grub-script-check.1.gz
605
man/man1/grub-script-check.1.gz
606
man/man1/grub-syslinux2cfg.1.gz
553
man/man8/grub-bios-setup.8.gz
607
man/man8/grub-bios-setup.8.gz
554
man/man8/grub-install.8.gz
608
man/man8/grub-install.8.gz
609
man/man8/grub-macbless.8.gz
555
man/man8/grub-mkconfig.8.gz
610
man/man8/grub-mkconfig.8.gz
556
man/man8/grub-mknetdir.8.gz
557
man/man8/grub-ofpathname.8.gz
611
man/man8/grub-ofpathname.8.gz
558
man/man8/grub-probe.8.gz
612
man/man8/grub-probe.8.gz
559
man/man8/grub-reboot.8.gz
613
man/man8/grub-reboot.8.gz
560
man/man8/grub-set-default.8.gz
614
man/man8/grub-set-default.8.gz
561
man/man8/grub-sparc64-setup.8.gz
615
man/man8/grub-sparc64-setup.8.gz
616
sbin/grub-bios-setup
617
sbin/grub-install
618
sbin/grub-macbless
619
sbin/grub-mkconfig
620
sbin/grub-ofpathname
621
sbin/grub-probe
622
sbin/grub-reboot
623
sbin/grub-set-default
624
sbin/grub-sparc64-setup
625
%%DATADIR%%/grub-mkconfig_lib

Return to bug 234508