[Midnightbsd-cvs] mports [23622] trunk/sysutils: add grub 2
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jul 22 12:21:15 EDT 2018
Revision: 23622
http://svnweb.midnightbsd.org/mports/?rev=23622
Author: laffer1
Date: 2018-07-22 12:21:13 -0400 (Sun, 22 Jul 2018)
Log Message:
-----------
add grub 2
Modified Paths:
--------------
trunk/sysutils/Makefile
Added Paths:
-----------
trunk/sysutils/grub2/
trunk/sysutils/grub2/Makefile
trunk/sysutils/grub2/distinfo
trunk/sysutils/grub2/files/
trunk/sysutils/grub2/files/patch-Makefile.util.am
trunk/sysutils/grub2/files/patch-Makefile.util.def
trunk/sysutils/grub2/files/patch-build-aux_test-driver
trunk/sysutils/grub2/files/patch-configure.ac
trunk/sysutils/grub2/files/patch-grub-2.00-zfs-feature-flag-support
trunk/sysutils/grub2/files/patch-grub-core-Makefile.core.am
trunk/sysutils/grub2/files/patch-grub-core-gnulib-Makefile.am
trunk/sysutils/grub2/files/patch-grub-core-gnulib-argp-fmtstream.c
trunk/sysutils/grub2/files/patch-grub-core-loader-i386-bsd.c
trunk/sysutils/grub2/files/patch-include-grub-util-libzfs.h
trunk/sysutils/grub2/files/patch-util-grub-mkfont.c
trunk/sysutils/grub2/files/patch-util_grub-install.in
trunk/sysutils/grub2/pkg-descr
trunk/sysutils/grub2/pkg-message
trunk/sysutils/grub2/pkg-plist
Modified: trunk/sysutils/Makefile
===================================================================
--- trunk/sysutils/Makefile 2018-07-22 05:51:05 UTC (rev 23621)
+++ trunk/sysutils/Makefile 2018-07-22 16:21:13 UTC (rev 23622)
@@ -54,6 +54,7 @@
SUBDIR += gnome-settings-daemon
SUBDIR += gnome-system-monitor
SUBDIR += gnome_subr
+SUBDIR += grub2
SUBDIR += grub2-bhyve
SUBDIR += gstreamer-plugins-hal
SUBDIR += hal
Added: trunk/sysutils/grub2/Makefile
===================================================================
--- trunk/sysutils/grub2/Makefile (rev 0)
+++ trunk/sysutils/grub2/Makefile 2018-07-22 16:21:13 UTC (rev 23622)
@@ -0,0 +1,63 @@
+# Created by: sem at FreeBSD.org
+# $FreeBSD: head/sysutils/grub2/Makefile 449591 2017-09-10 20:55:38Z gerald $
+# $MidnightBSD$
+
+PORTNAME= grub2
+PORTVERSION= 2.00
+CATEGORIES= sysutils
+MASTER_SITES= GNU/grub
+DISTNAME= grub-${PORTVERSION}
+
+MAINTAINER= ports at MidnightBSD.org
+COMMENT= Multiboot boot loader
+
+LICENSE= gpl3
+
+BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex \
+ help2man:misc/help2man
+
+CONFLICTS= grub-0*
+SSP_UNSAFE= yes
+USE_GCC= yes
+GNU_CONFIGURE= yes
+USES= autoreconf bison cpe gettext gmake tar:xz
+ONLY_FOR_ARCHS= i386 amd64
+INFO= grub grub-dev
+MAKE_JOBS_UNSAFE= yes
+
+CPE_PRODUCT= grub
+CPE_VENDOR= gnu
+
+CONFIGURE_ARGS= --disable-werror --localedir=${PREFIX}/share/locale
+CONFIGURE_ENV= CPP="${CC} -E" \
+ LEX=${LOCALBASE}/bin/flex
+
+OPTIONS_DEFINE= MKFONT FUSE
+OPTIONS_SUB= yes
+MKFONT_DESC= Build grub-mkfont (require freetype2)
+FUSE_DESC= Build grub-mount (require FUSE)
+
+MKFONT_CONFIGURE_ENABLE= grub-mkfont
+MKFONT_LIB_DEPENDS= libfreetype.so:print/freetype2
+MKFONT_BUILD_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
+
+FUSE_CONFIGURE_ENABLE= grub-mount
+FUSE_LIB_DEPENDS= libfuse.so:sysutils/fusefs-libs
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} != amd64
+PLIST_SUB+= EFIEMU="@comment "
+.else
+PLIST_SUB+= EFIEMU=""
+.endif
+
+post-patch:
+ @${LN} -s ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf ${WRKSRC}
+ @${TOUCH} -t 200001010000 ${WRKSRC}/Makefile.util.def
+
+post-configure:
+ @${LN} -sfh /usr/include/machine /usr/include/sys /usr/include/x86 \
+ ${WRKSRC}/grub-core
+
+.include <bsd.port.post.mk>
Property changes on: trunk/sysutils/grub2/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sysutils/grub2/distinfo
===================================================================
--- trunk/sysutils/grub2/distinfo (rev 0)
+++ trunk/sysutils/grub2/distinfo 2018-07-22 16:21:13 UTC (rev 23622)
@@ -0,0 +1,2 @@
+SHA256 (grub-2.00.tar.xz) = 784ec38e7edc32239ad75b8e66df04dc8bfb26d88681bc9f627133a6eb85c458
+SIZE (grub-2.00.tar.xz) = 5136412
Property changes on: trunk/sysutils/grub2/distinfo
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sysutils/grub2/files/patch-Makefile.util.am
===================================================================
--- trunk/sysutils/grub2/files/patch-Makefile.util.am (rev 0)
+++ trunk/sysutils/grub2/files/patch-Makefile.util.am 2018-07-22 16:21:13 UTC (rev 23622)
@@ -0,0 +1,254 @@
+--- Makefile.util.am.orig
++++ Makefile.util.am
+@@ -185,7 +185,7 @@ endif
+
+ if COND_emu
+ noinst_LIBRARIES += libgrubmods.a
+-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_s!
tream.c
++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 gru!
b-core/lib/xzembed/xz_dec_stream.c
+ nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h
+ libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn
+ libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H
+@@ -197,7 +197,7 @@ endif
+
+ if COND_i386_pc
+ noinst_LIBRARIES += libgrubmods.a
+-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_s!
tream.c
++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 gru!
b-core/lib/xzembed/xz_dec_stream.c
+ nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h
+ libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn
+ libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H
+@@ -209,7 +209,7 @@ endif
+
+ if COND_i386_efi
+ noinst_LIBRARIES += libgrubmods.a
+-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_s!
tream.c
++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 gru!
b-core/lib/xzembed/xz_dec_stream.c
+ nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h
+ libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn
+ libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H
+@@ -221,7 +221,7 @@ endif
+
+ if COND_i386_qemu
+ noinst_LIBRARIES += libgrubmods.a
+-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_s!
tream.c
++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 gru!
b-core/lib/xzembed/xz_dec_stream.c
+ nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h
+ libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn
+ libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H
+@@ -233,7 +233,7 @@ endif
+
+ if COND_i386_coreboot
+ noinst_LIBRARIES += libgrubmods.a
+-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_s!
tream.c
++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 gru!
b-core/lib/xzembed/xz_dec_stream.c
+ nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h
+ libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn
+ libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H
+@@ -245,7 +245,7 @@ endif
+
+ if COND_i386_multiboot
+ noinst_LIBRARIES += libgrubmods.a
+-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_s!
tream.c
++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 gru!
b-core/lib/xzembed/xz_dec_stream.c
+ nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h
+ libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn
+ libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H
+@@ -257,7 +257,7 @@ endif
+
+ if COND_i386_ieee1275
+ noinst_LIBRARIES += libgrubmods.a
+-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_s!
tream.c
++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 gru!
b-core/lib/xzembed/xz_dec_stream.c
+ nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h
+ libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn
+ libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H
+@@ -269,7 +269,7 @@ endif
+
+ if COND_x86_64_efi
+ noinst_LIBRARIES += libgrubmods.a
+-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_s!
tream.c
++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 gru!
b-core/lib/xzembed/xz_dec_stream.c
+ nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h
+ libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn
+ libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H
+@@ -281,7 +281,7 @@ endif
+
+ if COND_mips_loongson
+ noinst_LIBRARIES += libgrubmods.a
+-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_s!
tream.c
++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 gru!
b-core/lib/xzembed/xz_dec_stream.c
+ nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h
+ libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn
+ libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H
+@@ -293,7 +293,7 @@ endif
+
+ if COND_sparc64_ieee1275
+ noinst_LIBRARIES += libgrubmods.a
+-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_s!
tream.c
++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 gru!
b-core/lib/xzembed/xz_dec_stream.c
+ nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h
+ libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn
+ libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H
+@@ -305,7 +305,7 @@ endif
+
+ if COND_powerpc_ieee1275
+ noinst_LIBRARIES += libgrubmods.a
+-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_s!
tream.c
++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 gru!
b-core/lib/xzembed/xz_dec_stream.c
+ nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h
+ libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn
+ libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H
+@@ -317,7 +317,7 @@ endif
+
+ if COND_mips_arc
+ noinst_LIBRARIES += libgrubmods.a
+-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_s!
tream.c
++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 gru!
b-core/lib/xzembed/xz_dec_stream.c
+ nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h
+ libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn
+ libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H
+@@ -329,7 +329,7 @@ endif
+
+ if COND_ia64_efi
+ noinst_LIBRARIES += libgrubmods.a
+-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_s!
tream.c
++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 gru!
b-core/lib/xzembed/xz_dec_stream.c
+ nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h
+ libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn
+ libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H
+@@ -341,7 +341,7 @@ endif
+
+ if COND_mips_qemu_mips
+ noinst_LIBRARIES += libgrubmods.a
+-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_s!
tream.c
++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 gru!
b-core/lib/xzembed/xz_dec_stream.c
+ nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h
+ libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn
+ libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H
+@@ -3361,7 +3361,7 @@ CLEANFILES += grub-mount.1
+ endif
+ grub_mount_SOURCES = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c
+ nodist_grub_mount_SOURCES = grub_fstest_init.c
+-grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse
++grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse
+ grub_mount_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
+ grub_mount_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
+ grub_mount_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
+@@ -3386,7 +3386,7 @@ CLEANFILES += grub-mount.1
+ endif
+ grub_mount_SOURCES = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c
+ nodist_grub_mount_SOURCES = grub_fstest_init.c
+-grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse
++grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse
+ grub_mount_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
+ grub_mount_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
+ grub_mount_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
+@@ -3411,7 +3411,7 @@ CLEANFILES += grub-mount.1
+ endif
+ grub_mount_SOURCES = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c
+ nodist_grub_mount_SOURCES = grub_fstest_init.c
+-grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse
++grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse
+ grub_mount_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
+ grub_mount_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
+ grub_mount_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
+@@ -3436,7 +3436,7 @@ CLEANFILES += grub-mount.1
+ endif
+ grub_mount_SOURCES = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c
+ nodist_grub_mount_SOURCES = grub_fstest_init.c
+-grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse
++grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse
+ grub_mount_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
+ grub_mount_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
+ grub_mount_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
+@@ -3461,7 +3461,7 @@ CLEANFILES += grub-mount.1
+ endif
+ grub_mount_SOURCES = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c
+ nodist_grub_mount_SOURCES = grub_fstest_init.c
+-grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse
++grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse
+ grub_mount_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
+ grub_mount_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
+ grub_mount_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
+@@ -3486,7 +3486,7 @@ CLEANFILES += grub-mount.1
+ endif
+ grub_mount_SOURCES = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c
+ nodist_grub_mount_SOURCES = grub_fstest_init.c
+-grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse
++grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse
+ grub_mount_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
+ grub_mount_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
+ grub_mount_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
+@@ -3511,7 +3511,7 @@ CLEANFILES += grub-mount.1
+ endif
+ grub_mount_SOURCES = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c
+ nodist_grub_mount_SOURCES = grub_fstest_init.c
+-grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse
++grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse
+ grub_mount_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
+ grub_mount_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
+ grub_mount_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
+@@ -3536,7 +3536,7 @@ CLEANFILES += grub-mount.1
+ endif
+ grub_mount_SOURCES = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c
+ nodist_grub_mount_SOURCES = grub_fstest_init.c
+-grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse
++grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse
+ grub_mount_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
+ grub_mount_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
+ grub_mount_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
+@@ -3561,7 +3561,7 @@ CLEANFILES += grub-mount.1
+ endif
+ grub_mount_SOURCES = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c
+ nodist_grub_mount_SOURCES = grub_fstest_init.c
+-grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse
++grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse
+ grub_mount_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
+ grub_mount_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
+ grub_mount_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
+@@ -3586,7 +3586,7 @@ CLEANFILES += grub-mount.1
+ endif
+ grub_mount_SOURCES = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c
+ nodist_grub_mount_SOURCES = grub_fstest_init.c
+-grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse
++grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse
+ grub_mount_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
+ grub_mount_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
+ grub_mount_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
+@@ -3611,7 +3611,7 @@ CLEANFILES += grub-mount.1
+ endif
+ grub_mount_SOURCES = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c
+ nodist_grub_mount_SOURCES = grub_fstest_init.c
+-grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse
++grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse
+ grub_mount_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
+ grub_mount_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
+ grub_mount_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
+@@ -3636,7 +3636,7 @@ CLEANFILES += grub-mount.1
+ endif
+ grub_mount_SOURCES = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c
+ nodist_grub_mount_SOURCES = grub_fstest_init.c
+-grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse
++grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse
+ grub_mount_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
+ grub_mount_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
+ grub_mount_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
+@@ -3661,7 +3661,7 @@ CLEANFILES += grub-mount.1
+ endif
+ grub_mount_SOURCES = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c
+ nodist_grub_mount_SOURCES = grub_fstest_init.c
+-grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse
++grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse
+ grub_mount_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
+ grub_mount_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
+ grub_mount_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
+@@ -3686,7 +3686,7 @@ CLEANFILES += grub-mount.1
+ endif
+ grub_mount_SOURCES = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c
+ nodist_grub_mount_SOURCES = grub_fstest_init.c
+-grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse
++grub_mount_LDADD = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse
+ grub_mount_CFLAGS = $(AM_CFLAGS) $(CFLAGS_PROGRAM)
+ grub_mount_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM)
+ grub_mount_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM)
Property changes on: trunk/sysutils/grub2/files/patch-Makefile.util.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sysutils/grub2/files/patch-Makefile.util.def
===================================================================
--- trunk/sysutils/grub2/files/patch-Makefile.util.def (rev 0)
+++ trunk/sysutils/grub2/files/patch-Makefile.util.def 2018-07-22 16:21:13 UTC (rev 23622)
@@ -0,0 +1,11 @@
+--- Makefile.util.def.orig
++++ Makefile.util.def
+@@ -266,7 +266,7 @@ program = {
+ ldadd = libgrubgcry.a;
+ ldadd = libgrubkern.a;
+ ldadd = grub-core/gnulib/libgnu.a;
+- ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse';
++ ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse';
+ condition = COND_GRUB_MOUNT;
+ };
+
Property changes on: trunk/sysutils/grub2/files/patch-Makefile.util.def
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sysutils/grub2/files/patch-build-aux_test-driver
===================================================================
--- trunk/sysutils/grub2/files/patch-build-aux_test-driver (rev 0)
+++ trunk/sysutils/grub2/files/patch-build-aux_test-driver 2018-07-22 16:21:13 UTC (rev 23622)
@@ -0,0 +1,130 @@
+--- build-aux/test-driver.o 2013-07-29 08:36:33.775875020 -0400
++++ build-aux/test-driver 2013-07-29 08:35:04.085870311 -0400
+@@ -0,0 +1,127 @@
++#! /bin/sh
++# test-driver - basic testsuite driver script.
++
++scriptversion=2012-06-27.10; # UTC
++
++# Copyright (C) 2011-2013 Free Software Foundation, Inc.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
++
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# This file is maintained in Automake, please report
++# bugs to <bug-automake at gnu.org> or send patches to
++# <automake-patches at gnu.org>.
++
++# Make unconditional expansion of undefined variables an error. This
++# helps a lot in preventing typo-related bugs.
++set -u
++
++usage_error ()
++{
++ echo "$0: $*" >&2
++ print_usage >&2
++ exit 2
++}
++
++print_usage ()
++{
++ cat <<END
++Usage:
++ test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
++ [--expect-failure={yes|no}] [--color-tests={yes|no}]
++ [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
++The '--test-name', '--log-file' and '--trs-file' options are mandatory.
++END
++}
++
++# TODO: better error handling in option parsing (in particular, ensure
++# TODO: $log_file, $trs_file and $test_name are defined).
++test_name= # Used for reporting.
++log_file= # Where to save the output of the test script.
++trs_file= # Where to save the metadata of the test run.
++expect_failure=no
++color_tests=no
++enable_hard_errors=yes
++while test $# -gt 0; do
++ case $1 in
++ --help) print_usage; exit $?;;
++ --version) echo "test-driver $scriptversion"; exit $?;;
++ --test-name) test_name=$2; shift;;
++ --log-file) log_file=$2; shift;;
++ --trs-file) trs_file=$2; shift;;
++ --color-tests) color_tests=$2; shift;;
++ --expect-failure) expect_failure=$2; shift;;
++ --enable-hard-errors) enable_hard_errors=$2; shift;;
++ --) shift; break;;
++ -*) usage_error "invalid option: '$1'";;
++ esac
++ shift
++done
++
++if test $color_tests = yes; then
++ # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
++ red='[0;31m' # Red.
++ grn='[0;32m' # Green.
++ lgn='[1;32m' # Light green.
++ blu='[1;34m' # Blue.
++ mgn='[0;35m' # Magenta.
++ std='[m' # No color.
++else
++ red= grn= lgn= blu= mgn= std=
++fi
++
++do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
++trap "st=129; $do_exit" 1
++trap "st=130; $do_exit" 2
++trap "st=141; $do_exit" 13
++trap "st=143; $do_exit" 15
++
++# Test script is run here.
++"$@" >$log_file 2>&1
++estatus=$?
++if test $enable_hard_errors = no && test $estatus -eq 99; then
++ estatus=1
++fi
++
++case $estatus:$expect_failure in
++ 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
++ 0:*) col=$grn res=PASS recheck=no gcopy=no;;
++ 77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
++ 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;;
++ *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;;
++ *:*) col=$red res=FAIL recheck=yes gcopy=yes;;
++esac
++
++# Report outcome to console.
++echo "${col}${res}${std}: $test_name"
++
++# Register the test result, and other relevant metadata.
++echo ":test-result: $res" > $trs_file
++echo ":global-test-result: $res" >> $trs_file
++echo ":recheck: $recheck" >> $trs_file
++echo ":copy-in-global-log: $gcopy" >> $trs_file
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-time-zone: "UTC"
++# time-stamp-end: "; # UTC"
++# End:
Property changes on: trunk/sysutils/grub2/files/patch-build-aux_test-driver
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sysutils/grub2/files/patch-configure.ac
===================================================================
--- trunk/sysutils/grub2/files/patch-configure.ac (rev 0)
+++ trunk/sysutils/grub2/files/patch-configure.ac 2018-07-22 16:21:13 UTC (rev 23622)
@@ -0,0 +1,35 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -1044,19 +1044,19 @@ fi
+
+ if test x"$libzfs_excuse" = x ; then
+ # Only check for system headers if libzfs support has not been disabled.
+- AC_CHECK_HEADERS(libzfs.h libnvpair.h)
++ AC_CHECK_HEADERS(libzfs.h libnvpair.h, [], [], [typedef int boolean_t;])
+ fi
+
+ if test x"$libzfs_excuse" = x ; then
+ AC_CHECK_LIB([zfs], [libzfs_init],
+ [],
+- [libzfs_excuse="need zfs library"])
++ [libzfs_excuse="need zfs library"], [-lavl -lnvpair -luutil -lm])
+ fi
+
+ if test x"$libzfs_excuse" = x ; then
+ AC_CHECK_LIB([nvpair], [nvlist_print],
+ [],
+- [libzfs_excuse="need nvpair library"])
++ [libzfs_excuse="need nvpair library"], [-lavl -lnvpair -luutil -lm])
+ fi
+
+ if test x"$enable_libzfs" = xyes && test x"$libzfs_excuse" != x ; then
+@@ -1069,6 +1069,9 @@ if test x"$libzfs_excuse" = x ; then
+ AC_DEFINE([HAVE_LIBZFS], [1],
+ [Define to 1 if you have the ZFS library.])
+ LIBNVPAIR="-lnvpair"
++ if test x$host_kernel = xkfreebsd; then
++ LIBNVPAIR="$LIBNVPAIR -lavl -luutil -lm"
++ fi
+ AC_DEFINE([HAVE_LIBNVPAIR], [1],
+ [Define to 1 if you have the NVPAIR library.])
+ fi
Property changes on: trunk/sysutils/grub2/files/patch-configure.ac
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sysutils/grub2/files/patch-grub-2.00-zfs-feature-flag-support
===================================================================
--- trunk/sysutils/grub2/files/patch-grub-2.00-zfs-feature-flag-support (rev 0)
+++ trunk/sysutils/grub2/files/patch-grub-2.00-zfs-feature-flag-support 2018-07-22 16:21:13 UTC (rev 23622)
@@ -0,0 +1,894 @@
+From
+
+ http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.00-zfs-feature-flag-support-r1.patch
+
+ZFS Feature Flag Support
+
+This is a monolithic version of the following commits:
+
+https://github.com/maxximino/grub2/commit/31a32560fd7948ae5ff5c63105d7c068de7890c8
+https://github.com/maxximino/grub2/commit/595d76e8ca0690a963f5533689de8db54ef07e75
+https://github.com/maxximino/grub2/commit/58344034e40218b20500fa2936eb4d7d019e1e88
+https://github.com/maxximino/grub2/commit/f98cb078abab2c14bb0766b5a0ceb055683dab81
+https://github.com/maxximino/grub2/commit/f12806f43a969a654dee7bb89b2e8fd5c42f0e2e
+
+A change was made to account for d8a0feb6 from upstream. This change prevents a
+compile time failure that is caused by a change in the callback interface used
+by mzap_interate(). Modifications to nvlist_find_value() were reverted to
+resolve Gentoo bug #462740. This eliminated the need for the new nvpair_type()
+and nvpair_value() functions. They have been removed to silence a compiler
+warning and reduce the size of the patch. Further adjustments were made to
+silence the following warnings:
+
+/var/tmp/portage/sys-boot/grub-2.00-r2/work/grub-2.00/grub-core/fs/zfs/zfs_lz4.c:77:5:
+warning: "__STDC_VERSION__" is not defined [-Wundef]
+/var/tmp/portage/sys-boot/grub-2.00-r2/work/grub-2.00/grub-core/fs/zfs/zfs.c:4079:3:
+warning: passing argument 4 of 'mzap_iterate' from incompatible pointer type
+[enabled by default]
+
+The initial feature flag support patches were written by Delphix while the LZ4
+support was written by Saso Kiselkov. The work porting this to GRUB2 was done
+by Massimo Maggi, while the adaption to Gentoo's GRUB2 package was done by
+Richard Yao.
+
+diff --git a/Makefile.util.def b/Makefile.util.def
+index b80187c..1bf3038 100644
+--- Makefile.util.def
++++ Makefile.util.def
+@@ -95,6 +95,7 @@ library = {
+ common = grub-core/fs/zfs/zfs.c;
+ common = grub-core/fs/zfs/zfsinfo.c;
+ common = grub-core/fs/zfs/zfs_lzjb.c;
++ common = grub-core/fs/zfs/zfs_lz4.c;
+ common = grub-core/fs/zfs/zfs_sha256.c;
+ common = grub-core/fs/zfs/zfs_fletcher.c;
+ common = grub-core/lib/envblk.c;
+diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
+index 39e77a4..1550b90 100644
+--- grub-core/Makefile.core.def
++++ grub-core/Makefile.core.def
+@@ -1186,6 +1186,7 @@ module = {
+ name = zfs;
+ common = fs/zfs/zfs.c;
+ common = fs/zfs/zfs_lzjb.c;
++ common = fs/zfs/zfs_lz4.c;
+ common = fs/zfs/zfs_sha256.c;
+ common = fs/zfs/zfs_fletcher.c;
+ };
+diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
+index ba0554a..811e3df 100644
+--- grub-core/fs/zfs/zfs.c
++++ grub-core/fs/zfs/zfs.c
+@@ -2,6 +2,7 @@
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 1999,2000,2001,2002,2003,2004,2009,2010,2011 Free Software Foundation, Inc.
+ * Copyright 2010 Sun Microsystems, Inc.
++ * Copyright (c) 2012 by Delphix. All rights reserved.
+ *
+ * GRUB is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -153,11 +154,13 @@ ZAP_LEAF_ENTRY(zap_leaf_phys_t *l, int bs, int idx)
+
+
+ /*
+- * Decompression Entry - lzjb
++ * Decompression Entry - lzjb & lz4
+ */
+
+ extern grub_err_t lzjb_decompress (void *, void *, grub_size_t, grub_size_t);
+
++extern grub_err_t lz4_decompress (void *, void *, grub_size_t, grub_size_t);
++
+ typedef grub_err_t zfs_decomp_func_t (void *s_start, void *d_start,
+ grub_size_t s_len, grub_size_t d_len);
+ typedef struct decomp_entry
+@@ -263,6 +266,19 @@ grub_crypto_cipher_handle_t (*grub_zfs_load_key) (const struct grub_zfs_key *key
+ grub_size_t keysize,
+ grub_uint64_t salt,
+ grub_uint64_t algo) = NULL;
++/*
++ * List of pool features that the grub implementation of ZFS supports for
++ * read. Note that features that are only required for write do not need
++ * to be listed here since grub opens pools in read-only mode.
++ */
++static const char *spa_feature_names[] = {
++ "org.illumos:lz4_compress","com.delphix:hole_birth",NULL
++};
++
++static int NESTED_FUNC_ATTR
++check_feature(const char *name, grub_uint64_t val);
++static int
++check_mos_features(dnode_phys_t *mosmdn_phys,grub_zfs_endian_t endian,struct grub_zfs_data* data );
+
+ static grub_err_t
+ zlib_decompress (void *s, void *d,
+@@ -322,6 +338,7 @@ static decomp_entry_t decomp_table[ZIO_COMPRESS_FUNCTIONS] = {
+ {"gzip-8", zlib_decompress}, /* ZIO_COMPRESS_GZIP8 */
+ {"gzip-9", zlib_decompress}, /* ZIO_COMPRESS_GZIP9 */
+ {"zle", zle_decompress}, /* ZIO_COMPRESS_ZLE */
++ {"lz4", lz4_decompress}, /* ZIO_COMPRESS_LZ4 */
+ };
+
+ static grub_err_t zio_read_data (blkptr_t * bp, grub_zfs_endian_t endian,
+@@ -482,15 +499,11 @@ uberblock_verify (uberblock_phys_t * ub, grub_uint64_t offset,
+
+ if (grub_zfs_to_cpu64 (uber->ub_magic, GRUB_ZFS_LITTLE_ENDIAN)
+ == UBERBLOCK_MAGIC
+- && grub_zfs_to_cpu64 (uber->ub_version, GRUB_ZFS_LITTLE_ENDIAN) > 0
+- && grub_zfs_to_cpu64 (uber->ub_version, GRUB_ZFS_LITTLE_ENDIAN)
+- <= SPA_VERSION)
+- endian = GRUB_ZFS_LITTLE_ENDIAN;
++ && SPA_VERSION_IS_SUPPORTED(grub_zfs_to_cpu64 (uber->ub_version, GRUB_ZFS_LITTLE_ENDIAN)))
++ endian = GRUB_ZFS_LITTLE_ENDIAN;
+
+ if (grub_zfs_to_cpu64 (uber->ub_magic, GRUB_ZFS_BIG_ENDIAN) == UBERBLOCK_MAGIC
+- && grub_zfs_to_cpu64 (uber->ub_version, GRUB_ZFS_BIG_ENDIAN) > 0
+- && grub_zfs_to_cpu64 (uber->ub_version, GRUB_ZFS_BIG_ENDIAN)
+- <= SPA_VERSION)
++ && SPA_VERSION_IS_SUPPORTED(grub_zfs_to_cpu64 (uber->ub_version, GRUB_ZFS_BIG_ENDIAN)))
+ endian = GRUB_ZFS_BIG_ENDIAN;
+
+ if (endian == GRUB_ZFS_UNKNOWN_ENDIAN)
+@@ -764,6 +777,99 @@ fill_vdev_info (struct grub_zfs_data *data,
+ }
+
+ /*
++ * For a given XDR packed nvlist, verify the first 4 bytes and move on.
++ *
++ * An XDR packed nvlist is encoded as (comments from nvs_xdr_create) :
++ *
++ * encoding method/host endian (4 bytes)
++ * nvl_version (4 bytes)
++ * nvl_nvflag (4 bytes)
++ * encoded nvpairs:
++ * encoded size of the nvpair (4 bytes)
++ * decoded size of the nvpair (4 bytes)
++ * name string size (4 bytes)
++ * name string data (sizeof(NV_ALIGN4(string))
++ * data type (4 bytes)
++ * # of elements in the nvpair (4 bytes)
++ * data
++ * 2 zero's for the last nvpair
++ * (end of the entire list) (8 bytes)
++ *
++ */
++
++/*
++ * The nvlist_next_nvpair() function returns a handle to the next nvpair in the
++ * list following nvpair. If nvpair is NULL, the first pair is returned. If
++ * nvpair is the last pair in the nvlist, NULL is returned.
++ */
++static const char *
++nvlist_next_nvpair(const char *nvl, const char *nvpair)
++{
++ const char *nvp;
++ int encode_size;
++ int name_len;
++ if (nvl == NULL)
++ return (NULL);
++
++ if (nvpair == NULL) {
++ /* skip over header, nvl_version and nvl_nvflag */
++ nvpair = nvl + 4 * 3;
++ } else {
++ /* skip to the next nvpair */
++ encode_size = grub_be_to_cpu32 (grub_get_unaligned32(nvpair));
++ nvpair += encode_size;
++ }
++ /* 8 bytes of 0 marks the end of the list */
++ if (*(grub_uint64_t*)nvpair == 0)
++ return (NULL);
++ /*consistency checks*/
++ if (nvpair + 4 * 3 >= nvl + VDEV_PHYS_SIZE)
++ {
++ grub_dprintf ("zfs", "nvlist overflow\n");
++ grub_error (GRUB_ERR_BAD_FS, "incorrect nvlist");
++ return (NULL);
++ }
++ encode_size = grub_be_to_cpu32 (grub_get_unaligned32(nvpair));
++
++ nvp = nvpair + 4*2;
++ name_len = grub_be_to_cpu32 (grub_get_unaligned32 (nvp));
++ nvp += 4;
++
++ nvp = nvp + ((name_len + 3) & ~3); // align
++ if (nvp + 4 >= nvl + VDEV_PHYS_SIZE
++ || encode_size < 0
++ || nvp + 4 + encode_size > nvl + VDEV_PHYS_SIZE)
++ {
++ grub_dprintf ("zfs", "nvlist overflow\n");
++ grub_error (GRUB_ERR_BAD_FS, "incorrect nvlist");
++ return (NULL);
++ }
++ /* end consistency checks */
++
++ return (nvpair);
++}
++/*
++ * This function returns 0 on success and 1 on failure. On success, a string
++ * containing the name of nvpair is saved in buf.
++ */
++static int
++nvpair_name(const char *nvp, char **buf, int* buflen)
++{
++ int len;
++
++ /* skip over encode/decode size */
++ nvp += 4 * 2;
++
++ len = grub_be_to_cpu32 (grub_get_unaligned32 (nvp));
++ nvp=nvp+4;
++
++ *buf=(char*)nvp;
++ *buflen=len;
++
++ return (0);
++}
++
++/*
+ * Check the disk label information and retrieve needed vdev name-value pairs.
+ *
+ */
+@@ -773,7 +879,7 @@ check_pool_label (struct grub_zfs_data *data,
+ int *inserted)
+ {
+ grub_uint64_t pool_state, txg = 0;
+- char *nvlist;
++ char *nvlist,*features;
+ #if 0
+ char *nv;
+ #endif
+@@ -837,13 +943,13 @@ check_pool_label (struct grub_zfs_data *data,
+ }
+ grub_dprintf ("zfs", "check 8 passed\n");
+
+- if (version > SPA_VERSION)
++ if (!SPA_VERSION_IS_SUPPORTED(version))
+ {
+ grub_free (nvlist);
+ return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+ "too new version %llu > %llu",
+ (unsigned long long) version,
+- (unsigned long long) SPA_VERSION);
++ (unsigned long long) SPA_VERSION_BEFORE_FEATURES);
+ }
+ grub_dprintf ("zfs", "check 9 passed\n");
+
+@@ -893,7 +999,30 @@ check_pool_label (struct grub_zfs_data *data,
+ grub_free (nv);
+ }
+ grub_dprintf ("zfs", "check 10 passed\n");
+-
++ if ((features=grub_zfs_nvlist_lookup_nvlist(nvlist, ZPOOL_CONFIG_FEATURES_FOR_READ)))
++ {
++ const char *nvp=NULL;
++ char *name = grub_zalloc(51);
++ char *nameptr;
++ int namelen;
++ while ((nvp = nvlist_next_nvpair(features, nvp)) != NULL)
++ {
++ nvpair_name(nvp, &nameptr,&namelen);
++ if(namelen > 50){namelen=50;}
++ grub_strncpy(name,nameptr,namelen);
++ name[namelen]=0;
++ grub_dprintf("zfs","namelen=%u str=%s\n",namelen,name);
++ if (check_feature(name,1) != 0)
++ {
++ grub_dprintf("zfs","feature missing in check_pool_label:%s\n",name);
++ err= grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET," check_pool_label missing feature '%s' for read",name);
++ grub_free(name);
++ return err;
++ }
++ }
++ grub_free(name);
++ }
++ grub_dprintf ("zfs", "check 12 passed (feature flags)\n");
+ grub_free (nvlist);
+
+ return GRUB_ERR_NONE;
+@@ -3034,27 +3163,6 @@ dnode_get_fullpath (const char *fullpath, struct subvolume *subvol,
+ return err;
+ }
+
+-/*
+- * For a given XDR packed nvlist, verify the first 4 bytes and move on.
+- *
+- * An XDR packed nvlist is encoded as (comments from nvs_xdr_create) :
+- *
+- * encoding method/host endian (4 bytes)
+- * nvl_version (4 bytes)
+- * nvl_nvflag (4 bytes)
+- * encoded nvpairs:
+- * encoded size of the nvpair (4 bytes)
+- * decoded size of the nvpair (4 bytes)
+- * name string size (4 bytes)
+- * name string data (sizeof(NV_ALIGN4(string))
+- * data type (4 bytes)
+- * # of elements in the nvpair (4 bytes)
+- * data
+- * 2 zero's for the last nvpair
+- * (end of the entire list) (8 bytes)
+- *
+- */
+-
+ static int
+ nvlist_find_value (const char *nvlist_in, const char *name,
+ int valtype, char **val,
+@@ -3386,6 +3494,10 @@ zfs_mount (grub_device_t dev)
+ return NULL;
+ }
+
++ if (ub->ub_version >= SPA_VERSION_FEATURES &&
++ check_mos_features(&((objset_phys_t *) osp)->os_meta_dnode,ub_endian, data) != 0)
++ return NULL;
++
+ /* Got the MOS. Save it at the memory addr MOS. */
+ grub_memmove (&(data->mos.dn), &((objset_phys_t *) osp)->os_meta_dnode,
+ DNODE_SIZE);
+@@ -3910,6 +4022,64 @@ grub_zfs_dir (grub_device_t device, const char *path,
+ return grub_errno;
+ }
+
++static int NESTED_FUNC_ATTR
++check_feature(const char *name, grub_uint64_t val)
++{
++ int i;
++ if(val ==0) return 0;
++ if(*name==0) return 0;
++ for (i = 0; spa_feature_names[i] != NULL; i++)
++ {
++ if (grub_strcmp(name, spa_feature_names[i]) == 0)
++ return 0;
++ }
++ grub_printf("missing feature for read '%s'\n",name);
++ return 1;
++}
++
++/*
++ * Checks whether the MOS features that are active are supported by this
++ * (GRUB's) implementation of ZFS.
++ *
++ * Return:
++ * 0: Success.
++ * errnum: Failure.
++ */
++
++static int
++check_mos_features(dnode_phys_t *mosmdn_phys,grub_zfs_endian_t endian,struct grub_zfs_data* data )
++{
++ grub_uint64_t objnum;
++ grub_uint8_t errnum = 0;
++ dnode_end_t dn,mosmdn;
++ mzap_phys_t* mzp;
++ grub_zfs_endian_t endianzap;
++ int size;
++ grub_memmove(&(mosmdn.dn),mosmdn_phys,sizeof(dnode_phys_t));
++ mosmdn.endian=endian;
++ if ((errnum = dnode_get(&mosmdn, DMU_POOL_DIRECTORY_OBJECT,
++ DMU_OT_OBJECT_DIRECTORY, &dn,data)) != 0)
++ return (errnum);
++
++ /*
++ * Find the object number for 'features_for_read' and retrieve its
++ * corresponding dnode. Note that we don't check features_for_write
++ * because GRUB is not opening the pool for write.
++ */
++ if ((errnum = zap_lookup(&dn, DMU_POOL_FEATURES_FOR_READ, &objnum, data,0)) != 0)
++ return (errnum);
++
++ if ((errnum = dnode_get(&mosmdn, objnum, DMU_OTN_ZAP_METADATA, &dn, data)) != 0)
++ return (errnum);
++
++ if ((errnum = dmu_read(&dn, 0, (void**)&mzp, &endianzap,data)) != 0)
++ return (errnum);
++
++ size = grub_zfs_to_cpu16 (dn.dn.dn_datablkszsec, dn.endian) << SPA_MINBLOCKSHIFT;
++ return (mzap_iterate(mzp,endianzap, size, check_feature));
++}
++
++
+ #ifdef GRUB_UTIL
+ static grub_err_t
+ grub_zfs_embed (grub_device_t device __attribute__ ((unused)),
+diff --git a/grub-core/fs/zfs/zfs_lz4.c b/grub-core/fs/zfs/zfs_lz4.c
+new file mode 100644
+index 0000000..ff85a77
+--- /dev/null
++++ grub-core/fs/zfs/zfs_lz4.c
+@@ -0,0 +1,318 @@
++/*
++ * LZ4 - Fast LZ compression algorithm
++ * Header File
++ * Copyright (C) 2011-2013, Yann Collet.
++ * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are
++ * met:
++ *
++ * * Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * * Redistributions in binary form must reproduce the above
++ * copyright notice, this list of conditions and the following disclaimer
++ * in the documentation and/or other materials provided with the
++ * distribution.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ *
++ * You can contact the author at :
++ * - LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html
++ * - LZ4 source repository : http://code.google.com/p/lz4/
++ */
++
++#include <sys/endian.h>
++#include <grub/err.h>
++#include <grub/mm.h>
++#include <grub/misc.h>
++#include <grub/types.h>
++
++static int LZ4_uncompress_unknownOutputSize(const char *source, char *dest,
++ int isize, int maxOutputSize);
++
++/*
++ * CPU Feature Detection
++ */
++
++/* 32 or 64 bits ? */
++#if (defined(__x86_64__) || defined(__x86_64) || defined(__amd64__) || \
++ defined(__amd64) || defined(__ppc64__) || defined(_WIN64) || \
++ defined(__LP64__) || defined(_LP64))
++#define LZ4_ARCH64 1
++#else
++#define LZ4_ARCH64 0
++#endif
++
++/*
++ * Little Endian or Big Endian?
++ * Note: overwrite the below #define if you know your architecture endianess.
++ */
++#if BYTE_ORDER == BIG_ENDIAN
++#define LZ4_BIG_ENDIAN 1
++#else
++ /*
++ * Little Endian assumed. PDP Endian and other very rare endian format
++ * are unsupported.
++ */
++#endif
++
++/*
++ * Compiler Options
++ */
++
++#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 */
++/* "restrict" is a known keyword */
++#else
++/* Disable restrict */
++#ifndef restrict
++#define restrict /* Only if somebody already didn't take care of that.*/
++#endif
++#endif
++
++#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
++
++#define lz4_bswap16(x) ((unsigned short int) ((((x) >> 8) & 0xffu) \
++ | (((x) & 0xffu) << 8)))
++
++#if (GCC_VERSION >= 302) || (__INTEL_COMPILER >= 800) || defined(__clang__)
++#define expect(expr, value) (__builtin_expect((expr), (value)))
++#else
++#define expect(expr, value) (expr)
++#endif
++
++#define likely(expr) expect((expr) != 0, 1)
++#define unlikely(expr) expect((expr) != 0, 0)
++
++/* Basic types */
++#define BYTE grub_uint8_t
++#define U16 grub_uint16_t
++#define U32 grub_uint32_t
++#define S32 grub_int32_t
++#define U64 grub_uint64_t
++typedef grub_size_t size_t;
++
++typedef struct _U16_S {
++ U16 v;
++} U16_S;
++typedef struct _U32_S {
++ U32 v;
++} U32_S;
++typedef struct _U64_S {
++ U64 v;
++} U64_S;
++
++#define A64(x) (((U64_S *)(x))->v)
++#define A32(x) (((U32_S *)(x))->v)
++#define A16(x) (((U16_S *)(x))->v)
++
++/*
++ * Constants
++ */
++#define MINMATCH 4
++
++#define COPYLENGTH 8
++#define LASTLITERALS 5
++
++#define ML_BITS 4
++#define ML_MASK ((1U<<ML_BITS)-1)
++#define RUN_BITS (8-ML_BITS)
++#define RUN_MASK ((1U<<RUN_BITS)-1)
++
++/*
++ * Architecture-specific macros
++ */
++#if LZ4_ARCH64
++#define STEPSIZE 8
++#define UARCH U64
++#define AARCH A64
++#define LZ4_COPYSTEP(s, d) A64(d) = A64(s); d += 8; s += 8;
++#define LZ4_COPYPACKET(s, d) LZ4_COPYSTEP(s, d)
++#define LZ4_SECURECOPY(s, d, e) if (d < e) LZ4_WILDCOPY(s, d, e)
++#define HTYPE U32
++#define INITBASE(base) const BYTE* const base = ip
++#else
++#define STEPSIZE 4
++#define UARCH U32
++#define AARCH A32
++#define LZ4_COPYSTEP(s, d) A32(d) = A32(s); d += 4; s += 4;
++#define LZ4_COPYPACKET(s, d) LZ4_COPYSTEP(s, d); LZ4_COPYSTEP(s, d);
++#define LZ4_SECURECOPY LZ4_WILDCOPY
++#define HTYPE const BYTE*
++#define INITBASE(base) const int base = 0
++#endif
++
++#if (defined(LZ4_BIG_ENDIAN) && !defined(BIG_ENDIAN_NATIVE_BUT_INCOMPATIBLE))
++#define LZ4_READ_LITTLEENDIAN_16(d, s, p) \
++ { U16 v = A16(p); v = lz4_bswap16(v); d = (s) - v; }
++#define LZ4_WRITE_LITTLEENDIAN_16(p, i) \
++ { U16 v = (U16)(i); v = lz4_bswap16(v); A16(p) = v; p += 2; }
++#else
++#define LZ4_READ_LITTLEENDIAN_16(d, s, p) { d = (s) - A16(p); }
++#define LZ4_WRITE_LITTLEENDIAN_16(p, v) { A16(p) = v; p += 2; }
++#endif
++
++/* Macros */
++#define LZ4_WILDCOPY(s, d, e) do { LZ4_COPYPACKET(s, d) } while (d < e);
++
++/* Decompression functions */
++grub_err_t
++lz4_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len);
++
++grub_err_t
++lz4_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len)
++{
++ const BYTE *src = s_start;
++ U32 bufsiz = (src[0] << 24) | (src[1] << 16) | (src[2] << 8) |
++ src[3];
++
++ /* invalid compressed buffer size encoded at start */
++ if (bufsiz + 4 > s_len)
++ return grub_error(GRUB_ERR_BAD_FS,"lz4 decompression failed.");
++
++ /*
++ * Returns 0 on success (decompression function returned non-negative)
++ * and appropriate error on failure (decompression function returned negative).
++ */
++ return (LZ4_uncompress_unknownOutputSize((char*)s_start + 4, d_start, bufsiz,
++ d_len) < 0)?grub_error(GRUB_ERR_BAD_FS,"lz4 decompression failed."):0;
++}
++
++static int
++LZ4_uncompress_unknownOutputSize(const char *source,
++ char *dest, int isize, int maxOutputSize)
++{
++ /* Local Variables */
++ const BYTE *restrict ip = (const BYTE *) source;
++ const BYTE *const iend = ip + isize;
++ const BYTE *restrict ref;
++
++ BYTE *restrict op = (BYTE *) dest;
++ BYTE *const oend = op + maxOutputSize;
++ BYTE *cpy;
++
++ size_t dec[] = { 0, 3, 2, 3, 0, 0, 0, 0 };
++
++ /* Main Loop */
++ while (ip < iend) {
++ BYTE token;
++ int length;
++
++ /* get runlength */
++ token = *ip++;
++ if ((length = (token >> ML_BITS)) == RUN_MASK) {
++ int s = 255;
++ while ((ip < iend) && (s == 255)) {
++ s = *ip++;
++ length += s;
++ }
++ }
++ /* copy literals */
++ cpy = op + length;
++ if ((cpy > oend - COPYLENGTH) ||
++ (ip + length > iend - COPYLENGTH)) {
++ if (cpy > oend)
++ /*
++ * Error: request to write beyond destination
++ * buffer.
++ */
++ goto _output_error;
++ if (ip + length > iend)
++ /*
++ * Error : request to read beyond source
++ * buffer.
++ */
++ goto _output_error;
++ grub_memcpy(op, ip, length);
++ op += length;
++ ip += length;
++ if (ip < iend)
++ /* Error : LZ4 format violation */
++ goto _output_error;
++ /* Necessarily EOF, due to parsing restrictions. */
++ break;
++ }
++ LZ4_WILDCOPY(ip, op, cpy);
++ ip -= (op - cpy);
++ op = cpy;
++
++ /* get offset */
++ LZ4_READ_LITTLEENDIAN_16(ref, cpy, ip);
++ ip += 2;
++ if (ref < (BYTE * const) dest)
++ /*
++ * Error: offset creates reference outside of
++ * destination buffer.
++ */
++ goto _output_error;
++
++ /* get matchlength */
++ if ((length = (token & ML_MASK)) == ML_MASK) {
++ while (ip < iend) {
++ int s = *ip++;
++ length += s;
++ if (s == 255)
++ continue;
++ break;
++ }
++ }
++ /* copy repeated sequence */
++ if unlikely(op - ref < STEPSIZE) {
++#if LZ4_ARCH64
++ size_t dec2table[] = { 0, 0, 0, -1, 0, 1, 2, 3 };
++ size_t dec2 = dec2table[op - ref];
++#else
++ const int dec2 = 0;
++#endif
++ *op++ = *ref++;
++ *op++ = *ref++;
++ *op++ = *ref++;
++ *op++ = *ref++;
++ ref -= dec[op - ref];
++ A32(op) = A32(ref);
++ op += STEPSIZE - 4;
++ ref -= dec2;
++ } else {
++ LZ4_COPYSTEP(ref, op);
++ }
++ cpy = op + length - (STEPSIZE - 4);
++ if (cpy > oend - COPYLENGTH) {
++ if (cpy > oend)
++ /*
++ * Error: request to write outside of
++ * destination buffer.
++ */
++ goto _output_error;
++ LZ4_SECURECOPY(ref, op, (oend - COPYLENGTH));
++ while (op < cpy)
++ *op++ = *ref++;
++ op = cpy;
++ if (op == oend)
++ /*
++ * Check EOF (should never happen, since last
++ * 5 bytes are supposed to be literals).
++ */
++ break;
++ continue;
++ }
++ LZ4_SECURECOPY(ref, op, cpy);
++ op = cpy; /* correction */
++ }
++
++ /* end of decoding */
++ return (int)(((char *)op) - dest);
++
++ /* write overflow error detected */
++ _output_error:
++ return (int)(-(((char *)ip) - source));
++}
+diff --git a/grub-core/fs/zfs/zfsinfo.c b/grub-core/fs/zfs/zfsinfo.c
+index fdb587a..c96bf21 100644
+--- grub-core/fs/zfs/zfsinfo.c
++++ grub-core/fs/zfs/zfsinfo.c
+@@ -132,21 +132,31 @@ print_vdev_info (char *nvlist, int tab)
+ grub_free (path);
+ return GRUB_ERR_NONE;
+ }
++ char is_mirror=(grub_strcmp(type,VDEV_TYPE_MIRROR) == 0);
++ char is_raidz=(grub_strcmp(type,VDEV_TYPE_RAIDZ) == 0);
+
+- if (grub_strcmp (type, VDEV_TYPE_MIRROR) == 0)
++ if (is_mirror || is_raidz)
+ {
+ int nelm, i;
+
+ nelm = grub_zfs_nvlist_lookup_nvlist_array_get_nelm
+ (nvlist, ZPOOL_CONFIG_CHILDREN);
+
++ if(is_mirror){
++ grub_puts_ (N_("This VDEV is a mirror"));
++ }
++ else if(is_raidz){
++ grub_uint64_t parity;
++ grub_zfs_nvlist_lookup_uint64(nvlist,"nparity",&parity);
++ grub_printf_ (N_("This VDEV is a RAIDZ%llu\n"),(unsigned long long)parity);
++ }
+ print_tabs (tab);
+ if (nelm <= 0)
+ {
+- grub_puts_ (N_("Incorrect mirror"));
++ grub_puts_ (N_("Incorrect VDEV"));
+ return GRUB_ERR_NONE;
+ }
+- grub_printf_ (N_("Mirror with %d children\n"), nelm);
++ grub_printf_ (N_("VDEV with %d children\n"), nelm);
+ print_state (nvlist, tab);
+ for (i = 0; i < nelm; i++)
+ {
+@@ -162,14 +172,14 @@ print_vdev_info (char *nvlist, int tab)
+ total element number. And the number itself is fine,
+ only the element isn't.
+ */
+- grub_printf_ (N_("Mirror element number %d isn't correct\n"), i);
++ grub_printf_ (N_("VDEV element number %d isn't correct\n"), i);
+ continue;
+ }
+
+ /* TRANSLATORS: it's the element carying the number %d, not
+ total element number. This is used in enumeration
+ "Element number 1", "Element number 2", ... */
+- grub_printf_ (N_("Mirror element number %d:\n"), i);
++ grub_printf_ (N_("VDEV element number %d:\n"), i);
+ print_vdev_info (child, tab + 1);
+
+ grub_free (child);
+diff --git a/include/grub/zfs/dmu.h b/include/grub/zfs/dmu.h
+index 8fc6dc5..4ad616c 100644
+--- include/grub/zfs/dmu.h
++++ include/grub/zfs/dmu.h
+@@ -22,6 +22,39 @@
+
+ #ifndef _SYS_DMU_H
+ #define _SYS_DMU_H
++#define B_FALSE 0
++#define B_TRUE 1
++
++#define DMU_OT_NEWTYPE 0x80
++#define DMU_OT_METADATA 0x40
++#define DMU_OT_BYTESWAP_MASK 0x3f
++
++#define DMU_OT(byteswap, metadata) \
++ (DMU_OT_NEWTYPE | \
++ ((metadata) ? DMU_OT_METADATA : 0) | \
++ ((byteswap) & DMU_OT_BYTESWAP_MASK))
++
++#define DMU_OT_IS_VALID(ot) (((ot) & DMU_OT_NEWTYPE) ? \
++ ((ot) & DMU_OT_BYTESWAP_MASK) < DMU_BSWAP_NUMFUNCS : \
++ (ot) < DMU_OT_NUMTYPES)
++
++#define DMU_OT_IS_METADATA(ot) (((ot) & DMU_OT_NEWTYPE) ? \
++ ((ot) & DMU_OT_METADATA) : \
++ dmu_ot[(ot)].ot_metadata)
++
++typedef enum dmu_object_byteswap {
++ DMU_BSWAP_UINT8,
++ DMU_BSWAP_UINT16,
++ DMU_BSWAP_UINT32,
++ DMU_BSWAP_UINT64,
++ DMU_BSWAP_ZAP,
++ DMU_BSWAP_DNODE,
++ DMU_BSWAP_OBJSET,
++ DMU_BSWAP_ZNODE,
++ DMU_BSWAP_OLDACL,
++ DMU_BSWAP_ACL,
++ DMU_BSWAP_NUMFUNCS
++} dmu_object_byteswap_t;
+
+ /*
+ * This file describes the interface that the DMU provides for its
+@@ -89,7 +122,17 @@ typedef enum dmu_object_type {
+ DMU_OT_SA_ATTR_REGISTRATION, /* ZAP */
+ DMU_OT_SA_ATTR_LAYOUTS, /* ZAP */
+ DMU_OT_DSL_KEYCHAIN = 54,
+- DMU_OT_NUMTYPES
++ DMU_OT_NUMTYPES,
++ DMU_OTN_UINT8_DATA = DMU_OT(DMU_BSWAP_UINT8, B_FALSE),
++ DMU_OTN_UINT8_METADATA = DMU_OT(DMU_BSWAP_UINT8, B_TRUE),
++ DMU_OTN_UINT16_DATA = DMU_OT(DMU_BSWAP_UINT16, B_FALSE),
++ DMU_OTN_UINT16_METADATA = DMU_OT(DMU_BSWAP_UINT16, B_TRUE),
++ DMU_OTN_UINT32_DATA = DMU_OT(DMU_BSWAP_UINT32, B_FALSE),
++ DMU_OTN_UINT32_METADATA = DMU_OT(DMU_BSWAP_UINT32, B_TRUE),
++ DMU_OTN_UINT64_DATA = DMU_OT(DMU_BSWAP_UINT64, B_FALSE),
++ DMU_OTN_UINT64_METADATA = DMU_OT(DMU_BSWAP_UINT64, B_TRUE),
++ DMU_OTN_ZAP_DATA = DMU_OT(DMU_BSWAP_ZAP, B_FALSE),
++ DMU_OTN_ZAP_METADATA = DMU_OT(DMU_BSWAP_ZAP, B_TRUE),
+ } dmu_object_type_t;
+
+ typedef enum dmu_objset_type {
+@@ -116,5 +159,6 @@ typedef enum dmu_objset_type {
+ #define DMU_POOL_HISTORY "history"
+ #define DMU_POOL_PROPS "pool_props"
+ #define DMU_POOL_L2CACHE "l2cache"
++#define DMU_POOL_FEATURES_FOR_READ "features_for_read"
+
+ #endif /* _SYS_DMU_H */
+diff --git a/include/grub/zfs/zfs.h b/include/grub/zfs/zfs.h
+index e326c8b..761ade7 100644
+--- include/grub/zfs/zfs.h
++++ include/grub/zfs/zfs.h
+@@ -36,8 +36,13 @@ typedef enum grub_zfs_endian
+ /*
+ * On-disk version number.
+ */
+-#define SPA_VERSION 33ULL
+-
++#define SPA_VERSION_INITIAL 1ULL
++#define SPA_VERSION_BEFORE_FEATURES 33ULL
++#define SPA_VERSION 5000ULL
++#define SPA_VERSION_FEATURES 5000ULL
++#define SPA_VERSION_IS_SUPPORTED(v) \
++ (((v) >= SPA_VERSION_INITIAL && (v) <= SPA_VERSION_BEFORE_FEATURES) || \
++ ((v) >= SPA_VERSION_FEATURES && (v) <= SPA_VERSION))
+ /*
+ * The following are configuration names used in the nvlist describing a pool's
+ * configuration.
+@@ -76,6 +81,7 @@ typedef enum grub_zfs_endian
+ #define ZPOOL_CONFIG_DDT_HISTOGRAM "ddt_histogram"
+ #define ZPOOL_CONFIG_DDT_OBJ_STATS "ddt_object_stats"
+ #define ZPOOL_CONFIG_DDT_STATS "ddt_stats"
++#define ZPOOL_CONFIG_FEATURES_FOR_READ "features_for_read"
+ /*
+ * The persistent vdev state is stored as separate values rather than a single
+ * 'vdev_state' entry. This is because a device can be in multiple states, such
+diff --git a/include/grub/zfs/zio.h b/include/grub/zfs/zio.h
+index b1c46da..8fad2cc 100644
+--- include/grub/zfs/zio.h
++++ include/grub/zfs/zio.h
+@@ -88,6 +88,7 @@ enum zio_compress {
+ ZIO_COMPRESS_GZIP8,
+ ZIO_COMPRESS_GZIP9,
+ ZIO_COMPRESS_ZLE,
++ ZIO_COMPRESS_LZ4,
+ ZIO_COMPRESS_FUNCTIONS
+ };
+
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index 987b37a..c55d9e3 100644
+--- po/POTFILES.in
++++ po/POTFILES.in
+@@ -173,6 +173,7 @@
+ ./grub-core/fs/zfs/zfs_fletcher.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/gdb/cstub.c
+ ./grub-core/gdb/gdb.c
Property changes on: trunk/sysutils/grub2/files/patch-grub-2.00-zfs-feature-flag-support
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sysutils/grub2/files/patch-grub-core-Makefile.core.am
===================================================================
--- trunk/sysutils/grub2/files/patch-grub-core-Makefile.core.am (rev 0)
+++ trunk/sysutils/grub2/files/patch-grub-core-Makefile.core.am 2018-07-22 16:21:13 UTC (rev 23622)
@@ -0,0 +1,128 @@
+--- grub-core/Makefile.core.am.orig
++++ grub-core/Makefile.core.am
+@@ -32004,7 +32004,7 @@ endif
+ if COND_emu
+ platform_PROGRAMS += zfs.module
+ MODULE_FILES += zfs.module$(EXEEXT)
+-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
++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
+ nodist_zfs_module_SOURCES = ## platform nodist sources
+ zfs_module_LDADD =
+ zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
+@@ -32026,7 +32026,7 @@ endif
+ if COND_i386_pc
+ platform_PROGRAMS += zfs.module
+ MODULE_FILES += zfs.module$(EXEEXT)
+-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
++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
+ nodist_zfs_module_SOURCES = ## platform nodist sources
+ zfs_module_LDADD =
+ zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
+@@ -32048,7 +32048,7 @@ endif
+ if COND_i386_efi
+ platform_PROGRAMS += zfs.module
+ MODULE_FILES += zfs.module$(EXEEXT)
+-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
++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
+ nodist_zfs_module_SOURCES = ## platform nodist sources
+ zfs_module_LDADD =
+ zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
+@@ -32070,7 +32070,7 @@ endif
+ if COND_i386_qemu
+ platform_PROGRAMS += zfs.module
+ MODULE_FILES += zfs.module$(EXEEXT)
+-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
++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
+ nodist_zfs_module_SOURCES = ## platform nodist sources
+ zfs_module_LDADD =
+ zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
+@@ -32092,7 +32092,7 @@ endif
+ if COND_i386_coreboot
+ platform_PROGRAMS += zfs.module
+ MODULE_FILES += zfs.module$(EXEEXT)
+-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
++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
+ nodist_zfs_module_SOURCES = ## platform nodist sources
+ zfs_module_LDADD =
+ zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
+@@ -32114,7 +32114,7 @@ endif
+ if COND_i386_multiboot
+ platform_PROGRAMS += zfs.module
+ MODULE_FILES += zfs.module$(EXEEXT)
+-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
++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
+ nodist_zfs_module_SOURCES = ## platform nodist sources
+ zfs_module_LDADD =
+ zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
+@@ -32136,7 +32136,7 @@ endif
+ if COND_i386_ieee1275
+ platform_PROGRAMS += zfs.module
+ MODULE_FILES += zfs.module$(EXEEXT)
+-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
++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
+ nodist_zfs_module_SOURCES = ## platform nodist sources
+ zfs_module_LDADD =
+ zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
+@@ -32158,7 +32158,7 @@ endif
+ if COND_x86_64_efi
+ platform_PROGRAMS += zfs.module
+ MODULE_FILES += zfs.module$(EXEEXT)
+-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
++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
+ nodist_zfs_module_SOURCES = ## platform nodist sources
+ zfs_module_LDADD =
+ zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
+@@ -32180,7 +32180,7 @@ endif
+ if COND_mips_loongson
+ platform_PROGRAMS += zfs.module
+ MODULE_FILES += zfs.module$(EXEEXT)
+-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
++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
+ nodist_zfs_module_SOURCES = ## platform nodist sources
+ zfs_module_LDADD =
+ zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
+@@ -32202,7 +32202,7 @@ endif
+ if COND_sparc64_ieee1275
+ platform_PROGRAMS += zfs.module
+ MODULE_FILES += zfs.module$(EXEEXT)
+-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
++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
+ nodist_zfs_module_SOURCES = ## platform nodist sources
+ zfs_module_LDADD =
+ zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
+@@ -32224,7 +32224,7 @@ endif
+ if COND_powerpc_ieee1275
+ platform_PROGRAMS += zfs.module
+ MODULE_FILES += zfs.module$(EXEEXT)
+-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
++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
+ nodist_zfs_module_SOURCES = ## platform nodist sources
+ zfs_module_LDADD =
+ zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
+@@ -32246,7 +32246,7 @@ endif
+ if COND_mips_arc
+ platform_PROGRAMS += zfs.module
+ MODULE_FILES += zfs.module$(EXEEXT)
+-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
++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
+ nodist_zfs_module_SOURCES = ## platform nodist sources
+ zfs_module_LDADD =
+ zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
+@@ -32268,7 +32268,7 @@ endif
+ if COND_ia64_efi
+ platform_PROGRAMS += zfs.module
+ MODULE_FILES += zfs.module$(EXEEXT)
+-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
++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
+ nodist_zfs_module_SOURCES = ## platform nodist sources
+ zfs_module_LDADD =
+ zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
+@@ -32290,7 +32290,7 @@ endif
+ if COND_mips_qemu_mips
+ platform_PROGRAMS += zfs.module
+ MODULE_FILES += zfs.module$(EXEEXT)
+-zfs_module_SOURCES = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c ## platform sources
++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
+ nodist_zfs_module_SOURCES = ## platform nodist sources
+ zfs_module_LDADD =
+ zfs_module_CFLAGS = $(AM_CFLAGS) $(CFLAGS_MODULE)
Property changes on: trunk/sysutils/grub2/files/patch-grub-core-Makefile.core.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sysutils/grub2/files/patch-grub-core-gnulib-Makefile.am
===================================================================
--- trunk/sysutils/grub2/files/patch-grub-core-gnulib-Makefile.am (rev 0)
+++ trunk/sysutils/grub2/files/patch-grub-core-gnulib-Makefile.am 2018-07-22 16:21:13 UTC (rev 23622)
@@ -0,0 +1,18 @@
+--- grub-core/gnulib/Makefile.am.orig
++++ grub-core/gnulib/Makefile.am
+@@ -404,13 +404,13 @@ all-local: charset.alias ref-add.sed ref
+
+ charset_alias = $(DESTDIR)$(libdir)/charset.alias
+ charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
+-install-exec-local: install-exec-localcharset
++install-exec-local:
+ install-exec-localcharset: all-local
+ if test $(GLIBC21) = no; then \
+ case '$(host_os)' in \
+ darwin[56]*) \
+ need_charset_alias=true ;; \
+- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
++ darwin* | cygwin* | mingw* | pw32* | cegcc* | freebsd*) \
+ need_charset_alias=false ;; \
+ *) \
+ need_charset_alias=true ;; \
Property changes on: trunk/sysutils/grub2/files/patch-grub-core-gnulib-Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sysutils/grub2/files/patch-grub-core-gnulib-argp-fmtstream.c
===================================================================
--- trunk/sysutils/grub2/files/patch-grub-core-gnulib-argp-fmtstream.c (rev 0)
+++ trunk/sysutils/grub2/files/patch-grub-core-gnulib-argp-fmtstream.c 2018-07-22 16:21:13 UTC (rev 23622)
@@ -0,0 +1,14 @@
+--- grub-core/gnulib/argp-fmtstream.c.orig
++++ grub-core/gnulib/argp-fmtstream.c
+@@ -47,7 +47,11 @@
+ #endif
+
+ #define INIT_BUF_SIZE 200
++#ifdef __FreeBSD__
++#define PRINTF_SIZE_GUESS 32767
++#else
+ #define PRINTF_SIZE_GUESS 150
++#endif
+
+ /* Return an argp_fmtstream that outputs to STREAM, and which prefixes lines
+ written on it with LMARGIN spaces and limits them to RMARGIN columns
Property changes on: trunk/sysutils/grub2/files/patch-grub-core-gnulib-argp-fmtstream.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sysutils/grub2/files/patch-grub-core-loader-i386-bsd.c
===================================================================
--- trunk/sysutils/grub2/files/patch-grub-core-loader-i386-bsd.c (rev 0)
+++ trunk/sysutils/grub2/files/patch-grub-core-loader-i386-bsd.c 2018-07-22 16:21:13 UTC (rev 23622)
@@ -0,0 +1,49 @@
+=== modified file 'grub-core/loader/i386/bsd.c'
+--- grub-core/loader/i386/bsd.c 2012-06-07 14:41:52 +0000
++++ grub-core/loader/i386/bsd.c 2012-07-21 17:44:45 +0000
+@@ -1309,7 +1309,7 @@
+ && phdr->p_type != PT_DYNAMIC)
+ return 0;
+
+- paddr = phdr->p_paddr & 0xFFFFFF;
++ paddr = phdr->p_paddr & 0xFFFFFFF;
+
+ if (paddr < kern_start)
+ kern_start = paddr;
+@@ -1333,7 +1333,7 @@
+ }
+
+ *do_load = 1;
+- phdr->p_paddr &= 0xFFFFFF;
++ phdr->p_paddr &= 0xFFFFFFF;
+ paddr = phdr->p_paddr;
+
+ *addr = (grub_addr_t) (paddr - kern_start + (grub_uint8_t *) kern_chunk_src);
+@@ -1351,7 +1351,7 @@
+ && phdr->p_type != PT_DYNAMIC)
+ return 0;
+
+- paddr = phdr->p_paddr & 0xffffff;
++ paddr = phdr->p_paddr & 0xfffffff;
+
+ if (paddr < kern_start)
+ kern_start = paddr;
+@@ -1375,7 +1375,7 @@
+ }
+
+ *do_load = 1;
+- paddr = phdr->p_paddr & 0xffffff;
++ paddr = phdr->p_paddr & 0xfffffff;
+
+ *addr = (grub_addr_t) (paddr - kern_start + (grub_uint8_t *) kern_chunk_src);
+
+@@ -1394,7 +1394,7 @@
+ {
+ grub_relocator_chunk_t ch;
+
+- entry = elf->ehdr.ehdr32.e_entry & 0xFFFFFF;
++ entry = elf->ehdr.ehdr32.e_entry & 0xFFFFFFF;
+ err = grub_elf32_phdr_iterate (elf, filename,
+ grub_bsd_elf32_size_hook, NULL);
+ if (err)
+
Property changes on: trunk/sysutils/grub2/files/patch-grub-core-loader-i386-bsd.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sysutils/grub2/files/patch-include-grub-util-libzfs.h
===================================================================
--- trunk/sysutils/grub2/files/patch-include-grub-util-libzfs.h (rev 0)
+++ trunk/sysutils/grub2/files/patch-include-grub-util-libzfs.h 2018-07-22 16:21:13 UTC (rev 23622)
@@ -0,0 +1,12 @@
+--- include/grub/util/libzfs.h.orig
++++ include/grub/util/libzfs.h
+@@ -22,6 +22,9 @@
+ #include <config.h>
+
+ #ifdef HAVE_LIBZFS_H
++#ifdef __FreeBSD__
++typedef int boolean_t;
++#endif
+ #include <libzfs.h>
+ #else /* ! HAVE_LIBZFS_H */
+
Property changes on: trunk/sysutils/grub2/files/patch-include-grub-util-libzfs.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sysutils/grub2/files/patch-util-grub-mkfont.c
===================================================================
--- trunk/sysutils/grub2/files/patch-util-grub-mkfont.c (rev 0)
+++ trunk/sysutils/grub2/files/patch-util-grub-mkfont.c 2018-07-22 16:21:13 UTC (rev 23622)
@@ -0,0 +1,13 @@
+--- util/grub-mkfont.c.orig
++++ util/grub-mkfont.c
+@@ -39,7 +39,7 @@
+ #include FT_FREETYPE_H
+ #include FT_TRUETYPE_TAGS_H
+ #include FT_TRUETYPE_TABLES_H
+-#include <freetype/ftsynth.h>
++#include FT_SYNTHESIS_H
+
+ #undef __FTERRORS_H__
+ #define FT_ERROR_START_LIST const char *ft_errmsgs[] = {
+
+
Property changes on: trunk/sysutils/grub2/files/patch-util-grub-mkfont.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sysutils/grub2/files/patch-util_grub-install.in
===================================================================
--- trunk/sysutils/grub2/files/patch-util_grub-install.in (rev 0)
+++ trunk/sysutils/grub2/files/patch-util_grub-install.in 2018-07-22 16:21:13 UTC (rev 23622)
@@ -0,0 +1,72 @@
+--- util/grub-install.in.orig 2012-06-26 21:31:03.000000000 +0000
++++ util/grub-install.in
+@@ -107,6 +107,8 @@ usage () {
+ print_option_help "--recheck" "$(gettext "delete device map if it already exists")"
+ print_option_help "--force" "$(gettext "install even if problems are detected")"
+ print_option_help "--force-file-id" "$(gettext "use identifier file even if UUID is available")"
++ print_option_help "--force-label" "$(gettext "use filesystem label even if UUID is available")"
++
+ print_option_help "--disk-module=$(gettext "MODULE")" "$(gettext "disk module to use (biosdisk or native). This option is only available on BIOS target.")"
+ print_option_help "--no-nvram" "$(gettext "don't update the \`boot-device' NVRAM variable. This option is only available on IEEE1275 targets.")"
+ print_option_help "--removable" "$(gettext "the installation device is removable. This option is only available on EFI.")"
+@@ -159,6 +161,9 @@ do
+ --force-file-id)
+ force_file_id=y ;;
+
++ --force-label)
++ force_fs_label=y ;;
++
+ # Accept and ignore for compatibility
+ --font)
+ shift;;
+@@ -585,7 +590,7 @@ fi
+ partmap_module=
+ for x in `echo "${grub_device}" | xargs "$grub_probe" --device-map="${device_map}" --target=partmap --device 2> /dev/null`; do
+ case "$x" in
+- netbsd | openbsd)
++ netbsd | openbsd | freebsd )
+ partmap_module="$partmap_module part_bsd";;
+ "") ;;
+ *)
+@@ -593,6 +598,11 @@ for x in `echo "${grub_device}" | xargs
+ esac
+ done
+
++case `uname -o` in
++ FreeBSD)
++ partmap_module="$partmap_module part_msdos part_bsd";;
++esac
++
+ # Device abstraction module, if any (lvm, raid).
+ devabstraction_module="`echo "${grub_device}" | xargs "$grub_probe" --device-map="${device_map}" --target=abstraction --device`"
+
+@@ -668,16 +678,28 @@ if [ "x${devabstraction_module}" = "x" ]
+ echo 1>&2
+ hints=
+ fi
++
++ if [ x"$force_fs_label" = xy ]; then
++ fs_label="`echo "${grub_device}" | xargs "$grub_probe" --device-map="${device_map}" --target=fs_label --device`"
++ fi
++
++ if [ x"$fs_label" != x ]; then
++ echo "search.fs_label ${fs_label} root $hints " >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
++ search_module=search_label
++ else
++
+ if [ x"$uuid" != x ]; then
+ echo "search.fs_uuid ${uuid} root $hints " >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
+ search_module=search_fs_uuid
+ else
+ mkdir -p "${grubdir}/uuid"
+- file="`mktemp "${grubdir}/uuid/XXXXXXXXXXXXXXXXXXXXXXXXX"`"
++ file="`mktemp "${grubdir}/uuid/XXXX-XXXX-XXXX"`"
+ relfile="`${grub_mkrelpath} "$file"`"
+ echo "search.file '${relfile}' root $hints " >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
+ search_module=search_fs_file
+ fi
++ fi
++
+ echo 'set prefix=($root)'"$(echo "${relative_grubdir}" | sed "s,\\([ \"'\\\\]\\),\\\\\\1,g")" >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
+ config_opt_file="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
+ modules="$modules $search_module"
Property changes on: trunk/sysutils/grub2/files/patch-util_grub-install.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sysutils/grub2/pkg-descr
===================================================================
--- trunk/sysutils/grub2/pkg-descr (rev 0)
+++ trunk/sysutils/grub2/pkg-descr 2018-07-22 16:21:13 UTC (rev 23622)
@@ -0,0 +1,8 @@
+GNU GRUB is a multiboot boot loader. It was derived from GRUB, the GRand
+Unified Bootloader, which was originally designed and implemented by Erich
+Stefan Boleyn.
+
+This port does not install GRUB on the master boot record of your hard drive.
+To do this you will need to read the info page that is installed by the port.
+
+WWW: http://www.gnu.org/software/grub/
Property changes on: trunk/sysutils/grub2/pkg-descr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sysutils/grub2/pkg-message
===================================================================
--- trunk/sysutils/grub2/pkg-message (rev 0)
+++ trunk/sysutils/grub2/pkg-message 2018-07-22 16:21:13 UTC (rev 23622)
@@ -0,0 +1,11 @@
+#############################################################
+To install GRUB on the master boot record of your hard drive
+use 'grub-install <drive-to-install>' command.
+
+A typical menu entry in /boot/grub/grub.cfg for FreeBSD:
+menuentry "FreeBSD" {
+ set root="(hd0,msdos1,bsd1)"
+ kfreebsd /boot/loader
+}
+Or use grub-mkconfig to create the config file.
+#############################################################
Property changes on: trunk/sysutils/grub2/pkg-message
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sysutils/grub2/pkg-plist
===================================================================
--- trunk/sysutils/grub2/pkg-plist (rev 0)
+++ trunk/sysutils/grub2/pkg-plist 2018-07-22 16:21:13 UTC (rev 23622)
@@ -0,0 +1,561 @@
+%%FUSE%%bin/grub-mount
+%%FUSE%%man/man1/grub-mount.1.gz
+%%MKFONT%%bin/grub-mkfont
+%%MKFONT%%man/man1/grub-mkfont.1.gz
+%%MKFONT%%share/grub/themes/starfield/dejavu_10.pf2
+%%MKFONT%%share/grub/themes/starfield/dejavu_12.pf2
+%%MKFONT%%share/grub/themes/starfield/dejavu_bold_14.pf2
+%%MKFONT%%share/grub/themes/starfield/dejavu_14.pf2
+%%MKFONT%%share/grub/themes/starfield/dejavu_16.pf2
+%%MKFONT%%share/grub/themes/starfield/blob_w.png
+%%MKFONT%%share/grub/themes/starfield/boot_menu_c.png
+%%MKFONT%%share/grub/themes/starfield/boot_menu_e.png
+%%MKFONT%%share/grub/themes/starfield/boot_menu_ne.png
+%%MKFONT%%share/grub/themes/starfield/boot_menu_n.png
+%%MKFONT%%share/grub/themes/starfield/boot_menu_nw.png
+%%MKFONT%%share/grub/themes/starfield/boot_menu_se.png
+%%MKFONT%%share/grub/themes/starfield/boot_menu_s.png
+%%MKFONT%%share/grub/themes/starfield/boot_menu_sw.png
+%%MKFONT%%share/grub/themes/starfield/boot_menu_w.png
+%%MKFONT%%share/grub/themes/starfield/slider_c.png
+%%MKFONT%%share/grub/themes/starfield/slider_n.png
+%%MKFONT%%share/grub/themes/starfield/slider_s.png
+%%MKFONT%%share/grub/themes/starfield/starfield.png
+%%MKFONT%%share/grub/themes/starfield/README
+%%MKFONT%%share/grub/themes/starfield/terminal_box_c.png
+%%MKFONT%%share/grub/themes/starfield/terminal_box_e.png
+%%MKFONT%%share/grub/themes/starfield/terminal_box_ne.png
+%%MKFONT%%share/grub/themes/starfield/terminal_box_n.png
+%%MKFONT%%share/grub/themes/starfield/terminal_box_nw.png
+%%MKFONT%%share/grub/themes/starfield/terminal_box_se.png
+%%MKFONT%%share/grub/themes/starfield/terminal_box_s.png
+%%MKFONT%%share/grub/themes/starfield/terminal_box_sw.png
+%%MKFONT%%share/grub/themes/starfield/terminal_box_w.png
+%%MKFONT%%share/grub/themes/starfield/theme.txt
+%%MKFONT%%share/grub/themes/starfield/COPYING.CC-BY-SA-3.0
+bin/grub-editenv
+bin/grub-fstest
+bin/grub-kbdcomp
+bin/grub-menulst2cfg
+bin/grub-mkimage
+bin/grub-mklayout
+bin/grub-mkpasswd-pbkdf2
+bin/grub-mkrelpath
+bin/grub-mkstandalone
+bin/grub-mkrescue
+bin/grub-script-check
+etc/grub.d/00_header
+etc/grub.d/30_os-prober
+etc/grub.d/40_custom
+etc/grub.d/41_custom
+etc/grub.d/10_kfreebsd
+etc/grub.d/README
+etc/bash_completion.d/grub
+lib/grub/i386-pc/acpi.mod
+lib/grub/i386-pc/acpi.module
+lib/grub/i386-pc/adler32.mod
+lib/grub/i386-pc/adler32.module
+lib/grub/i386-pc/affs.mod
+lib/grub/i386-pc/affs.module
+lib/grub/i386-pc/afs.mod
+lib/grub/i386-pc/afs.module
+lib/grub/i386-pc/ahci.mod
+lib/grub/i386-pc/ahci.module
+lib/grub/i386-pc/all_video.mod
+lib/grub/i386-pc/all_video.module
+lib/grub/i386-pc/aout.mod
+lib/grub/i386-pc/aout.module
+lib/grub/i386-pc/at_keyboard.mod
+lib/grub/i386-pc/at_keyboard.module
+lib/grub/i386-pc/ata.mod
+lib/grub/i386-pc/ata.module
+lib/grub/i386-pc/backtrace.mod
+lib/grub/i386-pc/backtrace.module
+lib/grub/i386-pc/bfs.mod
+lib/grub/i386-pc/bfs.module
+lib/grub/i386-pc/biosdisk.mod
+lib/grub/i386-pc/biosdisk.module
+lib/grub/i386-pc/bitmap.mod
+lib/grub/i386-pc/bitmap.module
+lib/grub/i386-pc/bitmap_scale.mod
+lib/grub/i386-pc/bitmap_scale.module
+lib/grub/i386-pc/blocklist.mod
+lib/grub/i386-pc/blocklist.module
+lib/grub/i386-pc/boot.image
+lib/grub/i386-pc/boot.img
+lib/grub/i386-pc/boot.mod
+lib/grub/i386-pc/boot.module
+lib/grub/i386-pc/bsd.mod
+lib/grub/i386-pc/bsd.module
+lib/grub/i386-pc/btrfs.mod
+lib/grub/i386-pc/btrfs.module
+lib/grub/i386-pc/bufio.mod
+lib/grub/i386-pc/bufio.module
+lib/grub/i386-pc/cat.mod
+lib/grub/i386-pc/cat.module
+lib/grub/i386-pc/cdboot.image
+lib/grub/i386-pc/cdboot.img
+lib/grub/i386-pc/chain.mod
+lib/grub/i386-pc/chain.module
+lib/grub/i386-pc/cmostest.mod
+lib/grub/i386-pc/cmostest.module
+lib/grub/i386-pc/cmp.mod
+lib/grub/i386-pc/cmp.module
+lib/grub/i386-pc/command.lst
+lib/grub/i386-pc/config.h
+lib/grub/i386-pc/configfile.mod
+lib/grub/i386-pc/configfile.module
+lib/grub/i386-pc/cpio.mod
+lib/grub/i386-pc/cpio.module
+lib/grub/i386-pc/cpio_be.mod
+lib/grub/i386-pc/cpio_be.module
+lib/grub/i386-pc/cpuid.mod
+lib/grub/i386-pc/cpuid.module
+lib/grub/i386-pc/crc64.mod
+lib/grub/i386-pc/crc64.module
+lib/grub/i386-pc/crypto.lst
+lib/grub/i386-pc/crypto.mod
+lib/grub/i386-pc/crypto.module
+lib/grub/i386-pc/cryptodisk.mod
+lib/grub/i386-pc/cryptodisk.module
+lib/grub/i386-pc/cs5536.mod
+lib/grub/i386-pc/cs5536.module
+lib/grub/i386-pc/date.mod
+lib/grub/i386-pc/date.module
+lib/grub/i386-pc/datehook.mod
+lib/grub/i386-pc/datehook.module
+lib/grub/i386-pc/datetime.mod
+lib/grub/i386-pc/datetime.module
+lib/grub/i386-pc/diskboot.image
+lib/grub/i386-pc/diskboot.img
+lib/grub/i386-pc/diskfilter.mod
+lib/grub/i386-pc/diskfilter.module
+lib/grub/i386-pc/dm_nv.mod
+lib/grub/i386-pc/dm_nv.module
+lib/grub/i386-pc/drivemap.mod
+lib/grub/i386-pc/drivemap.module
+lib/grub/i386-pc/echo.mod
+lib/grub/i386-pc/echo.module
+lib/grub/i386-pc/efiemu.mod
+lib/grub/i386-pc/efiemu.module
+%%EFIEMU%%lib/grub/i386-pc/efiemu32.o
+%%EFIEMU%%lib/grub/i386-pc/efiemu64.o
+lib/grub/i386-pc/ehci.mod
+lib/grub/i386-pc/ehci.module
+lib/grub/i386-pc/elf.mod
+lib/grub/i386-pc/elf.module
+lib/grub/i386-pc/exfat.mod
+lib/grub/i386-pc/exfat.module
+lib/grub/i386-pc/exfctest.mod
+lib/grub/i386-pc/exfctest.module
+lib/grub/i386-pc/ext2.mod
+lib/grub/i386-pc/ext2.module
+lib/grub/i386-pc/extcmd.mod
+lib/grub/i386-pc/extcmd.module
+lib/grub/i386-pc/fat.mod
+lib/grub/i386-pc/fat.module
+lib/grub/i386-pc/font.mod
+lib/grub/i386-pc/font.module
+lib/grub/i386-pc/freedos.mod
+lib/grub/i386-pc/freedos.module
+lib/grub/i386-pc/fs.lst
+lib/grub/i386-pc/fshelp.mod
+lib/grub/i386-pc/fshelp.module
+lib/grub/i386-pc/functional_test.mod
+lib/grub/i386-pc/functional_test.module
+lib/grub/i386-pc/gcry_arcfour.mod
+lib/grub/i386-pc/gcry_arcfour.module
+lib/grub/i386-pc/gcry_blowfish.mod
+lib/grub/i386-pc/gcry_blowfish.module
+lib/grub/i386-pc/gcry_camellia.mod
+lib/grub/i386-pc/gcry_camellia.module
+lib/grub/i386-pc/gcry_cast5.mod
+lib/grub/i386-pc/gcry_cast5.module
+lib/grub/i386-pc/gcry_crc.mod
+lib/grub/i386-pc/gcry_crc.module
+lib/grub/i386-pc/gcry_des.mod
+lib/grub/i386-pc/gcry_des.module
+lib/grub/i386-pc/gcry_md4.mod
+lib/grub/i386-pc/gcry_md4.module
+lib/grub/i386-pc/gcry_md5.mod
+lib/grub/i386-pc/gcry_md5.module
+lib/grub/i386-pc/gcry_rfc2268.mod
+lib/grub/i386-pc/gcry_rfc2268.module
+lib/grub/i386-pc/gcry_rijndael.mod
+lib/grub/i386-pc/gcry_rijndael.module
+lib/grub/i386-pc/gcry_rmd160.mod
+lib/grub/i386-pc/gcry_rmd160.module
+lib/grub/i386-pc/gcry_seed.mod
+lib/grub/i386-pc/gcry_seed.module
+lib/grub/i386-pc/gcry_serpent.mod
+lib/grub/i386-pc/gcry_serpent.module
+lib/grub/i386-pc/gcry_sha1.mod
+lib/grub/i386-pc/gcry_sha1.module
+lib/grub/i386-pc/gcry_sha256.mod
+lib/grub/i386-pc/gcry_sha256.module
+lib/grub/i386-pc/gcry_sha512.mod
+lib/grub/i386-pc/gcry_sha512.module
+lib/grub/i386-pc/gcry_tiger.mod
+lib/grub/i386-pc/gcry_tiger.module
+lib/grub/i386-pc/gcry_twofish.mod
+lib/grub/i386-pc/gcry_twofish.module
+lib/grub/i386-pc/gcry_whirlpool.mod
+lib/grub/i386-pc/gcry_whirlpool.module
+lib/grub/i386-pc/gdb.mod
+lib/grub/i386-pc/gdb.module
+lib/grub/i386-pc/gdb_grub
+lib/grub/i386-pc/geli.mod
+lib/grub/i386-pc/geli.module
+lib/grub/i386-pc/gettext.mod
+lib/grub/i386-pc/gettext.module
+lib/grub/i386-pc/gfxmenu.mod
+lib/grub/i386-pc/gfxmenu.module
+lib/grub/i386-pc/gfxterm.mod
+lib/grub/i386-pc/gfxterm.module
+lib/grub/i386-pc/gmodule.pl
+lib/grub/i386-pc/gptsync.mod
+lib/grub/i386-pc/gptsync.module
+lib/grub/i386-pc/gzio.mod
+lib/grub/i386-pc/gzio.module
+lib/grub/i386-pc/halt.mod
+lib/grub/i386-pc/halt.module
+lib/grub/i386-pc/hashsum.mod
+lib/grub/i386-pc/hashsum.module
+lib/grub/i386-pc/hdparm.mod
+lib/grub/i386-pc/hdparm.module
+lib/grub/i386-pc/hello.mod
+lib/grub/i386-pc/hello.module
+lib/grub/i386-pc/help.mod
+lib/grub/i386-pc/help.module
+lib/grub/i386-pc/hexdump.mod
+lib/grub/i386-pc/hexdump.module
+lib/grub/i386-pc/hfs.mod
+lib/grub/i386-pc/hfs.module
+lib/grub/i386-pc/hfsplus.mod
+lib/grub/i386-pc/hfsplus.module
+lib/grub/i386-pc/http.mod
+lib/grub/i386-pc/http.module
+lib/grub/i386-pc/iorw.mod
+lib/grub/i386-pc/iorw.module
+lib/grub/i386-pc/iso9660.mod
+lib/grub/i386-pc/iso9660.module
+lib/grub/i386-pc/jfs.mod
+lib/grub/i386-pc/jfs.module
+lib/grub/i386-pc/jpeg.mod
+lib/grub/i386-pc/jpeg.module
+lib/grub/i386-pc/kernel.exec
+lib/grub/i386-pc/kernel.img
+lib/grub/i386-pc/keylayouts.mod
+lib/grub/i386-pc/keylayouts.module
+lib/grub/i386-pc/keystatus.mod
+lib/grub/i386-pc/keystatus.module
+lib/grub/i386-pc/ldm.mod
+lib/grub/i386-pc/ldm.module
+lib/grub/i386-pc/legacycfg.mod
+lib/grub/i386-pc/legacycfg.module
+lib/grub/i386-pc/linux.mod
+lib/grub/i386-pc/linux.module
+lib/grub/i386-pc/linux16.mod
+lib/grub/i386-pc/linux16.module
+lib/grub/i386-pc/lnxboot.image
+lib/grub/i386-pc/lnxboot.img
+lib/grub/i386-pc/loadenv.mod
+lib/grub/i386-pc/loadenv.module
+lib/grub/i386-pc/loopback.mod
+lib/grub/i386-pc/loopback.module
+lib/grub/i386-pc/ls.mod
+lib/grub/i386-pc/ls.module
+lib/grub/i386-pc/lsacpi.mod
+lib/grub/i386-pc/lsacpi.module
+lib/grub/i386-pc/lsapm.mod
+lib/grub/i386-pc/lsapm.module
+lib/grub/i386-pc/lsmmap.mod
+lib/grub/i386-pc/lsmmap.module
+lib/grub/i386-pc/lspci.mod
+lib/grub/i386-pc/lspci.module
+lib/grub/i386-pc/luks.mod
+lib/grub/i386-pc/luks.module
+lib/grub/i386-pc/lvm.mod
+lib/grub/i386-pc/lvm.module
+lib/grub/i386-pc/lzma_decompress.image
+lib/grub/i386-pc/lzma_decompress.img
+lib/grub/i386-pc/lzopio.mod
+lib/grub/i386-pc/lzopio.module
+lib/grub/i386-pc/mdraid09.mod
+lib/grub/i386-pc/mdraid09.module
+lib/grub/i386-pc/mdraid09_be.mod
+lib/grub/i386-pc/mdraid09_be.module
+lib/grub/i386-pc/mdraid1x.mod
+lib/grub/i386-pc/mdraid1x.module
+lib/grub/i386-pc/memdisk.mod
+lib/grub/i386-pc/memdisk.module
+lib/grub/i386-pc/memrw.mod
+lib/grub/i386-pc/memrw.module
+lib/grub/i386-pc/minicmd.mod
+lib/grub/i386-pc/minicmd.module
+lib/grub/i386-pc/minix.mod
+lib/grub/i386-pc/minix.module
+lib/grub/i386-pc/minix2.mod
+lib/grub/i386-pc/minix2.module
+lib/grub/i386-pc/minix2_be.mod
+lib/grub/i386-pc/minix2_be.module
+lib/grub/i386-pc/minix3.mod
+lib/grub/i386-pc/minix3.module
+lib/grub/i386-pc/minix3_be.mod
+lib/grub/i386-pc/minix3_be.module
+lib/grub/i386-pc/minix_be.mod
+lib/grub/i386-pc/minix_be.module
+lib/grub/i386-pc/mmap.mod
+lib/grub/i386-pc/mmap.module
+lib/grub/i386-pc/moddep.lst
+lib/grub/i386-pc/modinfo.sh
+lib/grub/i386-pc/msdospart.mod
+lib/grub/i386-pc/msdospart.module
+lib/grub/i386-pc/multiboot.mod
+lib/grub/i386-pc/multiboot.module
+lib/grub/i386-pc/multiboot2.mod
+lib/grub/i386-pc/multiboot2.module
+lib/grub/i386-pc/net.mod
+lib/grub/i386-pc/net.module
+lib/grub/i386-pc/newc.mod
+lib/grub/i386-pc/newc.module
+lib/grub/i386-pc/nilfs2.mod
+lib/grub/i386-pc/nilfs2.module
+lib/grub/i386-pc/normal.mod
+lib/grub/i386-pc/normal.module
+lib/grub/i386-pc/ntfs.mod
+lib/grub/i386-pc/ntfs.module
+lib/grub/i386-pc/ntfscomp.mod
+lib/grub/i386-pc/ntfscomp.module
+lib/grub/i386-pc/ntldr.mod
+lib/grub/i386-pc/ntldr.module
+lib/grub/i386-pc/odc.mod
+lib/grub/i386-pc/odc.module
+lib/grub/i386-pc/ohci.mod
+lib/grub/i386-pc/ohci.module
+lib/grub/i386-pc/part_acorn.mod
+lib/grub/i386-pc/part_acorn.module
+lib/grub/i386-pc/part_amiga.mod
+lib/grub/i386-pc/part_amiga.module
+lib/grub/i386-pc/part_apple.mod
+lib/grub/i386-pc/part_apple.module
+lib/grub/i386-pc/part_bsd.mod
+lib/grub/i386-pc/part_bsd.module
+lib/grub/i386-pc/part_dvh.mod
+lib/grub/i386-pc/part_dvh.module
+lib/grub/i386-pc/part_gpt.mod
+lib/grub/i386-pc/part_gpt.module
+lib/grub/i386-pc/part_msdos.mod
+lib/grub/i386-pc/part_msdos.module
+lib/grub/i386-pc/part_plan.mod
+lib/grub/i386-pc/part_plan.module
+lib/grub/i386-pc/part_sun.mod
+lib/grub/i386-pc/part_sun.module
+lib/grub/i386-pc/part_sunpc.mod
+lib/grub/i386-pc/part_sunpc.module
+lib/grub/i386-pc/partmap.lst
+lib/grub/i386-pc/parttool.lst
+lib/grub/i386-pc/parttool.mod
+lib/grub/i386-pc/parttool.module
+lib/grub/i386-pc/password.mod
+lib/grub/i386-pc/password.module
+lib/grub/i386-pc/password_pbkdf2.mod
+lib/grub/i386-pc/password_pbkdf2.module
+lib/grub/i386-pc/pata.mod
+lib/grub/i386-pc/pata.module
+lib/grub/i386-pc/pbkdf2.mod
+lib/grub/i386-pc/pbkdf2.module
+lib/grub/i386-pc/pci.mod
+lib/grub/i386-pc/pci.module
+lib/grub/i386-pc/plan9.mod
+lib/grub/i386-pc/plan9.module
+lib/grub/i386-pc/play.mod
+lib/grub/i386-pc/play.module
+lib/grub/i386-pc/png.mod
+lib/grub/i386-pc/png.module
+lib/grub/i386-pc/priority_queue.mod
+lib/grub/i386-pc/priority_queue.module
+lib/grub/i386-pc/probe.mod
+lib/grub/i386-pc/probe.module
+lib/grub/i386-pc/pxe.mod
+lib/grub/i386-pc/pxe.module
+lib/grub/i386-pc/pxeboot.image
+lib/grub/i386-pc/pxeboot.img
+lib/grub/i386-pc/pxechain.mod
+lib/grub/i386-pc/pxechain.module
+lib/grub/i386-pc/raid5rec.mod
+lib/grub/i386-pc/raid5rec.module
+lib/grub/i386-pc/raid6rec.mod
+lib/grub/i386-pc/raid6rec.module
+lib/grub/i386-pc/read.mod
+lib/grub/i386-pc/read.module
+lib/grub/i386-pc/reboot.mod
+lib/grub/i386-pc/reboot.module
+lib/grub/i386-pc/regexp.mod
+lib/grub/i386-pc/regexp.module
+lib/grub/i386-pc/reiserfs.mod
+lib/grub/i386-pc/reiserfs.module
+lib/grub/i386-pc/relocator.mod
+lib/grub/i386-pc/relocator.module
+lib/grub/i386-pc/romfs.mod
+lib/grub/i386-pc/romfs.module
+lib/grub/i386-pc/scsi.mod
+lib/grub/i386-pc/scsi.module
+lib/grub/i386-pc/search.mod
+lib/grub/i386-pc/search.module
+lib/grub/i386-pc/search_fs_file.mod
+lib/grub/i386-pc/search_fs_file.module
+lib/grub/i386-pc/search_fs_uuid.mod
+lib/grub/i386-pc/search_fs_uuid.module
+lib/grub/i386-pc/search_label.mod
+lib/grub/i386-pc/search_label.module
+lib/grub/i386-pc/sendkey.mod
+lib/grub/i386-pc/sendkey.module
+lib/grub/i386-pc/serial.mod
+lib/grub/i386-pc/serial.module
+lib/grub/i386-pc/setjmp.mod
+lib/grub/i386-pc/setjmp.module
+lib/grub/i386-pc/setpci.mod
+lib/grub/i386-pc/setpci.module
+lib/grub/i386-pc/sfs.mod
+lib/grub/i386-pc/sfs.module
+lib/grub/i386-pc/sleep.mod
+lib/grub/i386-pc/sleep.module
+lib/grub/i386-pc/squash4.mod
+lib/grub/i386-pc/squash4.module
+lib/grub/i386-pc/tar.mod
+lib/grub/i386-pc/tar.module
+lib/grub/i386-pc/terminal.lst
+lib/grub/i386-pc/terminal.mod
+lib/grub/i386-pc/terminal.module
+lib/grub/i386-pc/terminfo.mod
+lib/grub/i386-pc/terminfo.module
+lib/grub/i386-pc/test.mod
+lib/grub/i386-pc/test.module
+lib/grub/i386-pc/test_blockarg.mod
+lib/grub/i386-pc/test_blockarg.module
+lib/grub/i386-pc/testload.mod
+lib/grub/i386-pc/testload.module
+lib/grub/i386-pc/tftp.mod
+lib/grub/i386-pc/tftp.module
+lib/grub/i386-pc/tga.mod
+lib/grub/i386-pc/tga.module
+lib/grub/i386-pc/time.mod
+lib/grub/i386-pc/time.module
+lib/grub/i386-pc/trig.mod
+lib/grub/i386-pc/trig.module
+lib/grub/i386-pc/true.mod
+lib/grub/i386-pc/true.module
+lib/grub/i386-pc/udf.mod
+lib/grub/i386-pc/udf.module
+lib/grub/i386-pc/ufs1.mod
+lib/grub/i386-pc/ufs1.module
+lib/grub/i386-pc/ufs2.mod
+lib/grub/i386-pc/ufs2.module
+lib/grub/i386-pc/uhci.mod
+lib/grub/i386-pc/uhci.module
+lib/grub/i386-pc/usb.mod
+lib/grub/i386-pc/usb.module
+lib/grub/i386-pc/usb_keyboard.mod
+lib/grub/i386-pc/usb_keyboard.module
+lib/grub/i386-pc/usbms.mod
+lib/grub/i386-pc/usbms.module
+lib/grub/i386-pc/usbserial_common.mod
+lib/grub/i386-pc/usbserial_common.module
+lib/grub/i386-pc/usbserial_ftdi.mod
+lib/grub/i386-pc/usbserial_ftdi.module
+lib/grub/i386-pc/usbserial_pl2303.mod
+lib/grub/i386-pc/usbserial_pl2303.module
+lib/grub/i386-pc/usbtest.mod
+lib/grub/i386-pc/usbtest.module
+lib/grub/i386-pc/vbe.mod
+lib/grub/i386-pc/vbe.module
+lib/grub/i386-pc/vga.mod
+lib/grub/i386-pc/vga.module
+lib/grub/i386-pc/vga_text.mod
+lib/grub/i386-pc/vga_text.module
+lib/grub/i386-pc/video.lst
+lib/grub/i386-pc/video.mod
+lib/grub/i386-pc/video.module
+lib/grub/i386-pc/video_bochs.mod
+lib/grub/i386-pc/video_bochs.module
+lib/grub/i386-pc/video_cirrus.mod
+lib/grub/i386-pc/video_cirrus.module
+lib/grub/i386-pc/video_fb.mod
+lib/grub/i386-pc/video_fb.module
+lib/grub/i386-pc/videoinfo.mod
+lib/grub/i386-pc/videoinfo.module
+lib/grub/i386-pc/videotest.mod
+lib/grub/i386-pc/videotest.module
+lib/grub/i386-pc/xfs.mod
+lib/grub/i386-pc/xfs.module
+lib/grub/i386-pc/xnu.mod
+lib/grub/i386-pc/xnu.module
+lib/grub/i386-pc/xnu_uuid.mod
+lib/grub/i386-pc/xnu_uuid.module
+lib/grub/i386-pc/xzio.mod
+lib/grub/i386-pc/xzio.module
+lib/grub/i386-pc/zfs.mod
+lib/grub/i386-pc/zfs.module
+lib/grub/i386-pc/zfscrypt.mod
+lib/grub/i386-pc/zfscrypt.module
+lib/grub/i386-pc/zfsinfo.mod
+lib/grub/i386-pc/zfsinfo.module
+sbin/grub-bios-setup
+sbin/grub-probe
+sbin/grub-install
+sbin/grub-mkconfig
+sbin/grub-mknetdir
+sbin/grub-ofpathname
+sbin/grub-set-default
+sbin/grub-sparc64-setup
+sbin/grub-reboot
+share/grub/grub-mkconfig_lib
+share/locale/ast/LC_MESSAGES/grub.mo
+share/locale/ca/LC_MESSAGES/grub.mo
+share/locale/da/LC_MESSAGES/grub.mo
+share/locale/de/LC_MESSAGES/grub.mo
+share/locale/de at hebrew/LC_MESSAGES/grub.mo
+share/locale/de_CH/LC_MESSAGES/grub.mo
+share/locale/en at arabic/LC_MESSAGES/grub.mo
+share/locale/en at cyrillic/LC_MESSAGES/grub.mo
+share/locale/en at greek/LC_MESSAGES/grub.mo
+share/locale/en at hebrew/LC_MESSAGES/grub.mo
+share/locale/en at piglatin/LC_MESSAGES/grub.mo
+share/locale/en at quot/LC_MESSAGES/grub.mo
+share/locale/eo/LC_MESSAGES/grub.mo
+share/locale/fi/LC_MESSAGES/grub.mo
+share/locale/fr/LC_MESSAGES/grub.mo
+share/locale/hu/LC_MESSAGES/grub.mo
+share/locale/id/LC_MESSAGES/grub.mo
+share/locale/it/LC_MESSAGES/grub.mo
+share/locale/ja/LC_MESSAGES/grub.mo
+share/locale/nl/LC_MESSAGES/grub.mo
+share/locale/pa/LC_MESSAGES/grub.mo
+share/locale/pl/LC_MESSAGES/grub.mo
+share/locale/ru/LC_MESSAGES/grub.mo
+share/locale/sv/LC_MESSAGES/grub.mo
+share/locale/uk/LC_MESSAGES/grub.mo
+share/locale/vi/LC_MESSAGES/grub.mo
+share/locale/zh_CN/LC_MESSAGES/grub.mo
+share/locale/zh_TW/LC_MESSAGES/grub.mo
+man/man1/grub-editenv.1.gz
+man/man1/grub-fstest.1.gz
+man/man1/grub-kbdcomp.1.gz
+man/man1/grub-menulst2cfg.1.gz
+man/man1/grub-mkimage.1.gz
+man/man1/grub-mklayout.1.gz
+man/man1/grub-mkpasswd-pbkdf2.1.gz
+man/man1/grub-mkrelpath.1.gz
+man/man1/grub-mkrescue.1.gz
+man/man1/grub-mkstandalone.1.gz
+man/man1/grub-script-check.1.gz
+man/man8/grub-bios-setup.8.gz
+man/man8/grub-install.8.gz
+man/man8/grub-mkconfig.8.gz
+man/man8/grub-mknetdir.8.gz
+man/man8/grub-ofpathname.8.gz
+man/man8/grub-probe.8.gz
+man/man8/grub-reboot.8.gz
+man/man8/grub-set-default.8.gz
+man/man8/grub-sparc64-setup.8.gz
Property changes on: trunk/sysutils/grub2/pkg-plist
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list