pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/52235: sysutils/grub2 update to 2.02



>Number:         52235
>Category:       pkg
>Synopsis:       sysutils/grub2 update to 2.02
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue May 16 03:50:00 +0000 2017
>Originator:     Frederic Fauberteau
>Release:        pkgsrc-2017Q1
>Organization:
>Environment:
NetBSD trashware 7.1_STABLE NetBSD 7.1_STABLE (TRASHWARE) #0: Sat Mar 18 13:42:25 CET 2017  triaxx@guardian:/home/triaxx/netbsd/usr/objdir/sys/arch/amd64/compile/TRASHWARE amd64

>Description:
sysutils/grub2-2.00 build now fails with pkgsrc flex version:
grub_script.yy.c: In function 'yy_fatal_error':
grub_script.yy.c:18:22: error: statement with no effect [-Werror=unused-value]
 
                      ^
grub_script.yy.c:2365:2: note: in expansion of macro 'fprintf'
  (void)yyg;
  ^
cc1: all warnings being treated as errors

I prefered update it to 2.02. I removed patch-stpcpy-* since NetBSD now implements stpcpy() but if somebody want grub2 on NetBSD 5, I could port them.
>How-To-Repeat:
cd /usr/pkgsrc/sysutils/grub2 && make install 
>Fix:
Here the patch followed by the changelog:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/grub2/Makefile,v
retrieving revision 1.9
diff -u -u -r1.9 Makefile
--- Makefile	17 May 2016 10:32:09 -0000	1.9
+++ Makefile	15 May 2017 13:46:28 -0000
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.9 2016/05/17 10:32:09 fhajny Exp $
 
-DISTNAME=		grub-2.00
+DISTNAME=		grub-2.02
 PKGNAME=		${DISTNAME:S/grub/grub2/}
-PKGREVISION=		5
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://ftp.gnu.org/gnu/grub/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
@@ -16,12 +15,12 @@
 
 ONLY_FOR_PLATFORM=	*-*-i386 *-*-x86_64
 
+USE_LANGUAGES+=		c c++
 USE_TOOLS+=		gmake flex bison gettext:run
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--disable-efiemu
-CONFIGURE_ARGS+=	--disable-grub-emu-usb
 CONFIGURE_ARGS+=	--disable-grub-emu-sdl
 CONFIGURE_ARGS+=	--disable-grub-emu-pci
 INFO_FILES=		yes
@@ -42,11 +41,6 @@
 FLEX_REQD=		2.5.35
 BUILD_DEPENDS+=		help2man>=1.36:../../converters/help2man
 
-# XXX Force use of pkgsrc's flex on NetBSD to prevent build failure.
-.if ${OPSYS} == "NetBSD"
-FLEX_REQD=		9
-.endif
-
 #
 # The configure script sets the variables `target_cpu' and `platform', which
 # are used for the location of the library directory.  The following mimics
@@ -116,7 +110,7 @@
 SUBST_CLASSES+=			fix-paths-1
 SUBST_STAGE.fix-paths-1=	post-patch
 SUBST_MESSAGE.fix-paths-1=	Fixing configuration paths in scripts.
-SUBST_FILES.fix-paths-1=	util/grub-install.in util/grub-mkconfig.in
+SUBST_FILES.fix-paths-1=	util/grub-mkconfig.in
 SUBST_SED.fix-paths-1=		-e 's,\(\$${sysconfdir}"\{0\,1\}\)/grub.d,\1,g'
 SUBST_SED.fix-paths-1+=		-e 's,\(\$${sysconfdir}"\{0\,1\}\)/default/grub,\1/default.conf,g'
 
@@ -127,7 +121,7 @@
 SUBST_STAGE.fix-dejavu=		pre-configure
 SUBST_MESSAGE.fix-dejavu=	Fixing dejavu search paths in configure.
 SUBST_FILES.fix-dejavu=		configure
-SUBST_SED.fix-dejavu=		-e 's, \(/usr/share/fonts/dejavu\);, \1 ${PREFIX}/share/fonts/X11/TTF;,g'
+SUBST_SED.fix-dejavu=		-e 's, \(/usr/share/fonts/dejavu\), \1 ${PREFIX}/share/fonts/X11/TTF,g'
 
 #
 # Do not use `\t' with sed, as it's not portable.
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/grub2/PLIST,v
retrieving revision 1.1
diff -u -u -r1.1 PLIST
--- PLIST	29 Jul 2012 21:44:13 -0000	1.1
+++ PLIST	15 May 2017 13:46:28 -0000
@@ -1,482 +1,599 @@
-@comment $NetBSD: PLIST,v 1.1 2012/07/29 21:44:13 gsutre Exp $
+@comment $NetBSD$
 bin/grub-editenv
+bin/grub-file
 bin/grub-fstest
+bin/grub-glue-efi
 bin/grub-kbdcomp
 bin/grub-menulst2cfg
-${PLIST.freetype}bin/grub-mkfont
+bin/grub-mkfont
 bin/grub-mkimage
 bin/grub-mklayout
+bin/grub-mknetdir
 bin/grub-mkpasswd-pbkdf2
 bin/grub-mkrelpath
 bin/grub-mkrescue
 bin/grub-mkstandalone
+bin/grub-render-label
 bin/grub-script-check
+bin/grub-syslinux2cfg
 info/grub-dev.info
 info/grub.info
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/acpi.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/acpi.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/adler32.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/adler32.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/affs.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/affs.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/afs.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/afs.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ahci.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ahci.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/all_video.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/all_video.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/aout.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/aout.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/at_keyboard.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/at_keyboard.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ata.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ata.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/backtrace.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/backtrace.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/bfs.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/bfs.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/biosdisk.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/biosdisk.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/bitmap.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/bitmap.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/bitmap_scale.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/bitmap_scale.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/blocklist.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/blocklist.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/boot.image
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/boot.img
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/boot.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/boot.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/bsd.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/bsd.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/btrfs.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/btrfs.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/bufio.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/bufio.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/cat.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/cat.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/cdboot.image
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/cdboot.img
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/chain.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/chain.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/cmostest.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/cmostest.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/cmp.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/cmp.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/command.lst
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/config.h
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/configfile.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/configfile.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/cpio.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/cpio.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/cpio_be.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/cpio_be.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/cpuid.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/cpuid.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/crc64.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/crc64.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/crypto.lst
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/crypto.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/crypto.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/cryptodisk.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/cryptodisk.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/cs5536.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/cs5536.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/date.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/date.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/datehook.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/datehook.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/datetime.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/datetime.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/diskboot.image
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/diskboot.img
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/diskfilter.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/diskfilter.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/dm_nv.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/dm_nv.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/drivemap.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/drivemap.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/echo.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/echo.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/efiemu.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/efiemu.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ehci.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ehci.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/elf.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/elf.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/exfat.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/exfat.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/exfctest.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/exfctest.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ext2.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ext2.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/extcmd.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/extcmd.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/fat.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/fat.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/font.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/font.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/freedos.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/freedos.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/fs.lst
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/fshelp.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/fshelp.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/functional_test.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/functional_test.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_arcfour.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_arcfour.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_blowfish.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_blowfish.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_camellia.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_camellia.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_cast5.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_cast5.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_crc.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_crc.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_des.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_des.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_md4.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_md4.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_md5.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_md5.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_rfc2268.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_rfc2268.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_rijndael.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_rijndael.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_rmd160.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_rmd160.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_seed.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_seed.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_serpent.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_serpent.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_sha1.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_sha1.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_sha256.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_sha256.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_sha512.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_sha512.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_tiger.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_tiger.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_twofish.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_twofish.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_whirlpool.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gcry_whirlpool.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gdb.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gdb.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gdb_grub
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/geli.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/geli.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gettext.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gettext.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gfxmenu.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gfxmenu.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gfxterm.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gfxterm.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gmodule.pl
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gptsync.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gptsync.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gzio.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/gzio.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/halt.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/halt.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/hashsum.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/hashsum.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/hdparm.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/hdparm.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/hello.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/hello.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/help.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/help.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/hexdump.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/hexdump.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/hfs.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/hfs.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/hfsplus.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/hfsplus.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/http.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/http.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/iorw.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/iorw.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/iso9660.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/iso9660.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/jfs.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/jfs.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/jpeg.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/jpeg.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/kernel.exec
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/kernel.img
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/keylayouts.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/keylayouts.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/keystatus.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/keystatus.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ldm.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ldm.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/legacycfg.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/legacycfg.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/linux.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/linux.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/linux16.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/linux16.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/lnxboot.image
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/lnxboot.img
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/loadenv.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/loadenv.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/loopback.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/loopback.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ls.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ls.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/lsacpi.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/lsacpi.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/lsapm.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/lsapm.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/lsmmap.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/lsmmap.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/lspci.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/lspci.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/luks.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/luks.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/lvm.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/lvm.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/lzma_decompress.image
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/lzma_decompress.img
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/lzopio.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/lzopio.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/mdraid09.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/mdraid09.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/mdraid09_be.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/mdraid09_be.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/mdraid1x.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/mdraid1x.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/memdisk.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/memdisk.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/memrw.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/memrw.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/minicmd.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/minicmd.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/minix.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/minix.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/minix2.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/minix2.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/minix2_be.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/minix2_be.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/minix3.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/minix3.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/minix3_be.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/minix3_be.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/minix_be.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/minix_be.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/mmap.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/mmap.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/moddep.lst
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/modinfo.sh
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/msdospart.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/msdospart.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/multiboot.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/multiboot.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/multiboot2.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/multiboot2.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/net.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/net.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/newc.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/newc.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/nilfs2.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/nilfs2.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/normal.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/normal.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ntfs.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ntfs.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ntfscomp.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ntfscomp.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ntldr.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ntldr.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/odc.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/odc.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ohci.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ohci.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/part_acorn.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/part_acorn.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/part_amiga.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/part_amiga.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/part_apple.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/part_apple.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/part_bsd.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/part_bsd.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/part_dvh.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/part_dvh.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/part_gpt.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/part_gpt.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/part_msdos.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/part_msdos.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/part_plan.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/part_plan.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/part_sun.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/part_sun.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/part_sunpc.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/part_sunpc.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/partmap.lst
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/parttool.lst
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/parttool.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/parttool.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/password.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/password.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/password_pbkdf2.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/password_pbkdf2.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/pata.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/pata.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/pbkdf2.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/pbkdf2.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/pci.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/pci.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/plan9.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/plan9.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/play.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/play.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/png.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/png.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/priority_queue.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/priority_queue.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/probe.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/probe.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/pxe.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/pxe.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/pxeboot.image
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/pxeboot.img
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/pxechain.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/pxechain.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/raid5rec.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/raid5rec.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/raid6rec.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/raid6rec.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/read.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/read.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/reboot.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/reboot.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/regexp.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/regexp.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/reiserfs.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/reiserfs.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/relocator.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/relocator.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/romfs.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/romfs.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/scsi.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/scsi.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/search.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/search.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/search_fs_file.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/search_fs_file.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/search_fs_uuid.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/search_fs_uuid.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/search_label.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/search_label.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/sendkey.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/sendkey.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/serial.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/serial.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/setjmp.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/setjmp.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/setpci.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/setpci.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/sfs.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/sfs.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/sleep.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/sleep.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/squash4.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/squash4.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/tar.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/tar.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/terminal.lst
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/terminal.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/terminal.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/terminfo.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/terminfo.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/test.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/test.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/test_blockarg.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/test_blockarg.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/testload.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/testload.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/tftp.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/tftp.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/tga.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/tga.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/time.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/time.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/trig.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/trig.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/true.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/true.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/udf.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/udf.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ufs1.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ufs1.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ufs2.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/ufs2.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/uhci.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/uhci.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/usb.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/usb.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/usb_keyboard.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/usb_keyboard.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/usbms.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/usbms.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/usbserial_common.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/usbserial_common.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/usbserial_ftdi.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/usbserial_ftdi.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/usbserial_pl2303.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/usbserial_pl2303.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/usbtest.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/usbtest.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/vbe.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/vbe.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/vga.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/vga.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/vga_text.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/vga_text.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/video.lst
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/video.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/video.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/video_bochs.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/video_bochs.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/video_cirrus.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/video_cirrus.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/video_fb.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/video_fb.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/videoinfo.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/videoinfo.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/videotest.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/videotest.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/xfs.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/xfs.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/xnu.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/xnu.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/xnu_uuid.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/xnu_uuid.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/xzio.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/xzio.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/zfs.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/zfs.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/zfscrypt.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/zfscrypt.module
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/zfsinfo.mod
-lib/grub/${GRUB_TARGET_CPU}-${GRUB_PLATFORM}/zfsinfo.module
+lib/charset.alias
+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/archelp.mod
+lib/grub/i386-pc/archelp.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/boot_hybrid.image
+lib/grub/i386-pc/boot_hybrid.img
+lib/grub/i386-pc/bsd.mod
+lib/grub/i386-pc/bsd.module
+lib/grub/i386-pc/bswap_test.mod
+lib/grub/i386-pc/bswap_test.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/cbfs.mod
+lib/grub/i386-pc/cbfs.module
+lib/grub/i386-pc/cbls.mod
+lib/grub/i386-pc/cbls.module
+lib/grub/i386-pc/cbmemc.mod
+lib/grub/i386-pc/cbmemc.module
+lib/grub/i386-pc/cbtable.mod
+lib/grub/i386-pc/cbtable.module
+lib/grub/i386-pc/cbtime.mod
+lib/grub/i386-pc/cbtime.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/cmdline_cat_test.mod
+lib/grub/i386-pc/cmdline_cat_test.module
+lib/grub/i386-pc/cmosdump.mod
+lib/grub/i386-pc/cmosdump.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/cmp_test.mod
+lib/grub/i386-pc/cmp_test.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/ctz_test.mod
+lib/grub/i386-pc/ctz_test.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/disk.mod
+lib/grub/i386-pc/disk.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/div.mod
+lib/grub/i386-pc/div.module
+lib/grub/i386-pc/div_test.mod
+lib/grub/i386-pc/div_test.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
+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/eval.mod
+lib/grub/i386-pc/eval.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/file.mod
+lib/grub/i386-pc/file.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_dsa.mod
+lib/grub/i386-pc/gcry_dsa.module
+lib/grub/i386-pc/gcry_idea.mod
+lib/grub/i386-pc/gcry_idea.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_rsa.mod
+lib/grub/i386-pc/gcry_rsa.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/gfxterm_background.mod
+lib/grub/i386-pc/gfxterm_background.module
+lib/grub/i386-pc/gfxterm_menu.mod
+lib/grub/i386-pc/gfxterm_menu.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/hfspluscomp.mod
+lib/grub/i386-pc/hfspluscomp.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/legacy_password_test.mod
+lib/grub/i386-pc/legacy_password_test.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/macbless.mod
+lib/grub/i386-pc/macbless.module
+lib/grub/i386-pc/macho.mod
+lib/grub/i386-pc/macho.module
+lib/grub/i386-pc/mda_text.mod
+lib/grub/i386-pc/mda_text.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/morse.mod
+lib/grub/i386-pc/morse.module
+lib/grub/i386-pc/mpi.mod
+lib/grub/i386-pc/mpi.module
+lib/grub/i386-pc/msdospart.mod
+lib/grub/i386-pc/msdospart.module
+lib/grub/i386-pc/mul_test.mod
+lib/grub/i386-pc/mul_test.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/nativedisk.mod
+lib/grub/i386-pc/nativedisk.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/offsetio.mod
+lib/grub/i386-pc/offsetio.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_dfly.mod
+lib/grub/i386-pc/part_dfly.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/pbkdf2_test.mod
+lib/grub/i386-pc/pbkdf2_test.module
+lib/grub/i386-pc/pci.mod
+lib/grub/i386-pc/pci.module
+lib/grub/i386-pc/pcidump.mod
+lib/grub/i386-pc/pcidump.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/procfs.mod
+lib/grub/i386-pc/procfs.module
+lib/grub/i386-pc/progress.mod
+lib/grub/i386-pc/progress.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/random.mod
+lib/grub/i386-pc/random.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/setjmp_test.mod
+lib/grub/i386-pc/setjmp_test.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/shift_test.mod
+lib/grub/i386-pc/shift_test.module
+lib/grub/i386-pc/signature_test.mod
+lib/grub/i386-pc/signature_test.module
+lib/grub/i386-pc/sleep.mod
+lib/grub/i386-pc/sleep.module
+lib/grub/i386-pc/sleep_test.mod
+lib/grub/i386-pc/sleep_test.module
+lib/grub/i386-pc/spkmodem.mod
+lib/grub/i386-pc/spkmodem.module
+lib/grub/i386-pc/squash4.mod
+lib/grub/i386-pc/squash4.module
+lib/grub/i386-pc/syslinuxcfg.mod
+lib/grub/i386-pc/syslinuxcfg.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/testspeed.mod
+lib/grub/i386-pc/testspeed.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/tr.mod
+lib/grub/i386-pc/tr.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/truecrypt.mod
+lib/grub/i386-pc/truecrypt.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/ufs1_be.mod
+lib/grub/i386-pc/ufs1_be.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/usbserial_usbdebug.mod
+lib/grub/i386-pc/usbserial_usbdebug.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/verify.mod
+lib/grub/i386-pc/verify.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_colors.mod
+lib/grub/i386-pc/video_colors.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/videotest_checksum.mod
+lib/grub/i386-pc/videotest_checksum.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/xnu_uuid_test.mod
+lib/grub/i386-pc/xnu_uuid_test.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
 man/man1/grub-editenv.1
+man/man1/grub-file.1
 man/man1/grub-fstest.1
+man/man1/grub-glue-efi.1
 man/man1/grub-kbdcomp.1
 man/man1/grub-menulst2cfg.1
-${PLIST.freetype}man/man1/grub-mkfont.1
+man/man1/grub-mkfont.1
 man/man1/grub-mkimage.1
 man/man1/grub-mklayout.1
+man/man1/grub-mknetdir.1
 man/man1/grub-mkpasswd-pbkdf2.1
 man/man1/grub-mkrelpath.1
 man/man1/grub-mkrescue.1
 man/man1/grub-mkstandalone.1
+man/man1/grub-render-label.1
 man/man1/grub-script-check.1
+man/man1/grub-syslinux2cfg.1
 man/man8/grub-bios-setup.8
 man/man8/grub-install.8
+man/man8/grub-macbless.8
 man/man8/grub-mkconfig.8
-man/man8/grub-mknetdir.8
 man/man8/grub-ofpathname.8
 man/man8/grub-probe.8
 man/man8/grub-reboot.8
@@ -484,8 +601,8 @@
 man/man8/grub-sparc64-setup.8
 sbin/grub-bios-setup
 sbin/grub-install
+sbin/grub-macbless
 sbin/grub-mkconfig
-sbin/grub-mknetdir
 sbin/grub-ofpathname
 sbin/grub-probe
 sbin/grub-reboot
@@ -507,43 +624,43 @@
 share/examples/grub/README
 share/examples/grub/default.conf.sample
 share/examples/grub/grub-bash-completion.sh
-${PLIST.freetype}share/grub/ascii.h
-${PLIST.freetype}share/grub/ascii.pf2
-${PLIST.freetype}share/grub/euro.pf2
-${PLIST.freetype}share/grub/unicode.pf2
-${PLIST.freetype}share/grub/widthspec.h
+share/grub/ascii.h
+share/grub/ascii.pf2
+share/grub/euro.pf2
 share/grub/grub-mkconfig_lib
-${PLIST.freetype}share/grub/themes/starfield/COPYING.CC-BY-SA-3.0
-${PLIST.freetype}share/grub/themes/starfield/README
-${PLIST.freetype}share/grub/themes/starfield/blob_w.png
-${PLIST.freetype}share/grub/themes/starfield/boot_menu_c.png
-${PLIST.freetype}share/grub/themes/starfield/boot_menu_e.png
-${PLIST.freetype}share/grub/themes/starfield/boot_menu_n.png
-${PLIST.freetype}share/grub/themes/starfield/boot_menu_ne.png
-${PLIST.freetype}share/grub/themes/starfield/boot_menu_nw.png
-${PLIST.freetype}share/grub/themes/starfield/boot_menu_s.png
-${PLIST.freetype}share/grub/themes/starfield/boot_menu_se.png
-${PLIST.freetype}share/grub/themes/starfield/boot_menu_sw.png
-${PLIST.freetype}share/grub/themes/starfield/boot_menu_w.png
-${PLIST.freetype}share/grub/themes/starfield/dejavu_10.pf2
-${PLIST.freetype}share/grub/themes/starfield/dejavu_12.pf2
-${PLIST.freetype}share/grub/themes/starfield/dejavu_14.pf2
-${PLIST.freetype}share/grub/themes/starfield/dejavu_16.pf2
-${PLIST.freetype}share/grub/themes/starfield/dejavu_bold_14.pf2
-${PLIST.freetype}share/grub/themes/starfield/slider_c.png
-${PLIST.freetype}share/grub/themes/starfield/slider_n.png
-${PLIST.freetype}share/grub/themes/starfield/slider_s.png
-${PLIST.freetype}share/grub/themes/starfield/starfield.png
-${PLIST.freetype}share/grub/themes/starfield/terminal_box_c.png
-${PLIST.freetype}share/grub/themes/starfield/terminal_box_e.png
-${PLIST.freetype}share/grub/themes/starfield/terminal_box_n.png
-${PLIST.freetype}share/grub/themes/starfield/terminal_box_ne.png
-${PLIST.freetype}share/grub/themes/starfield/terminal_box_nw.png
-${PLIST.freetype}share/grub/themes/starfield/terminal_box_s.png
-${PLIST.freetype}share/grub/themes/starfield/terminal_box_se.png
-${PLIST.freetype}share/grub/themes/starfield/terminal_box_sw.png
-${PLIST.freetype}share/grub/themes/starfield/terminal_box_w.png
-${PLIST.freetype}share/grub/themes/starfield/theme.txt
+share/grub/themes/starfield/COPYING.CC-BY-SA-3.0
+share/grub/themes/starfield/README
+share/grub/themes/starfield/blob_w.png
+share/grub/themes/starfield/boot_menu_c.png
+share/grub/themes/starfield/boot_menu_e.png
+share/grub/themes/starfield/boot_menu_n.png
+share/grub/themes/starfield/boot_menu_ne.png
+share/grub/themes/starfield/boot_menu_nw.png
+share/grub/themes/starfield/boot_menu_s.png
+share/grub/themes/starfield/boot_menu_se.png
+share/grub/themes/starfield/boot_menu_sw.png
+share/grub/themes/starfield/boot_menu_w.png
+share/grub/themes/starfield/dejavu_10.pf2
+share/grub/themes/starfield/dejavu_12.pf2
+share/grub/themes/starfield/dejavu_14.pf2
+share/grub/themes/starfield/dejavu_16.pf2
+share/grub/themes/starfield/dejavu_bold_14.pf2
+share/grub/themes/starfield/slider_c.png
+share/grub/themes/starfield/slider_n.png
+share/grub/themes/starfield/slider_s.png
+share/grub/themes/starfield/starfield.png
+share/grub/themes/starfield/terminal_box_c.png
+share/grub/themes/starfield/terminal_box_e.png
+share/grub/themes/starfield/terminal_box_n.png
+share/grub/themes/starfield/terminal_box_ne.png
+share/grub/themes/starfield/terminal_box_nw.png
+share/grub/themes/starfield/terminal_box_s.png
+share/grub/themes/starfield/terminal_box_se.png
+share/grub/themes/starfield/terminal_box_sw.png
+share/grub/themes/starfield/terminal_box_w.png
+share/grub/themes/starfield/theme.txt
+share/grub/unicode.pf2
+share/grub/widthspec.h
 share/locale/ast/LC_MESSAGES/grub.mo
 share/locale/ca/LC_MESSAGES/grub.mo
 share/locale/da/LC_MESSAGES/grub.mo
@@ -557,17 +674,27 @@
 share/locale/en@piglatin/LC_MESSAGES/grub.mo
 share/locale/en@quot/LC_MESSAGES/grub.mo
 share/locale/eo/LC_MESSAGES/grub.mo
+share/locale/es/LC_MESSAGES/grub.mo
 share/locale/fi/LC_MESSAGES/grub.mo
 share/locale/fr/LC_MESSAGES/grub.mo
+share/locale/gl/LC_MESSAGES/grub.mo
+share/locale/hr/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/ko/LC_MESSAGES/grub.mo
+share/locale/lt/LC_MESSAGES/grub.mo
+share/locale/nb/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/pt_BR/LC_MESSAGES/grub.mo
 share/locale/ru/LC_MESSAGES/grub.mo
+share/locale/sl/LC_MESSAGES/grub.mo
+share/locale/sr/LC_MESSAGES/grub.mo
 share/locale/sv/LC_MESSAGES/grub.mo
+share/locale/tr/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
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/grub2/distinfo,v
retrieving revision 1.6
diff -u -u -r1.6 distinfo
--- distinfo	3 May 2016 14:53:14 -0000	1.6
+++ distinfo	15 May 2017 13:46:28 -0000
@@ -1,22 +1,13 @@
 $NetBSD: distinfo,v 1.6 2016/05/03 14:53:14 nonaka Exp $
 
-SHA1 (grub-2.00.tar.gz) = fcb39b621680caf34071abcb9ec913d5da458554
-RMD160 (grub-2.00.tar.gz) = 7a4d4fc2a22dfe169c03ec54b9c9a078679aa506
-SHA512 (grub-2.00.tar.gz) = 5c819e1dcc3d39c3c3c97357da0e17c89635f252927fdb027ca6a489ace0d2e2f7a9ae2221bebb33575e3889b91382cdf84b0c70a0a698f51e721800545a2fd4
-Size (grub-2.00.tar.gz) = 8270319 bytes
+SHA1 (grub-2.02.tar.gz) = 2f778cf62a3126bae71ce428b512bffc964cf7d0
+RMD160 (grub-2.02.tar.gz) = 8428eba6ddd26cd36a852c99d343b2b7650e90ac
+SHA512 (grub-2.02.tar.gz) = 061d6332a2e44ad43aada1df4dfd25575685aa3612bb2b7cb75d5e2a0b4edecd965de74f0b4ee6176d00cfa7ee1db19f0a53f3e2466395b3a31a7769bb0fcf72
+Size (grub-2.02.tar.gz) = 10568950 bytes
 SHA1 (unifont-5.1.20080820.pcf.gz) = 87f8600ba24e521b5d20bdf6c4b71af8ae861e3a
 RMD160 (unifont-5.1.20080820.pcf.gz) = ddc87231a7c1e18e81a6f4578a4f0279bcd0c292
 SHA512 (unifont-5.1.20080820.pcf.gz) = 8939e2bc82ca97b60e6678f3ff079a2be7ba9b702f2e8ee289e853af5823695f7baafbf14b674fc5e41071f2a6de4f2dadd56bf8b4653849dd756d59622f1649
 Size (unifont-5.1.20080820.pcf.gz) = 1379965 bytes
-SHA1 (patch-configure) = 5bc08d640943e59c795113a4375a712c1932ccff
-SHA1 (patch-grub-core_lib_posix__wrap_sys_types.h) = 7510953e7bbed347f5d53e4535c309c365ba2bcd
-SHA1 (patch-grub-core_lib_posix__wrap_wchar.h) = 6509696c2d5e008634b710c63cb836664d0f8a89
-SHA1 (patch-grub-core_lib_xzembed_xz__dec__lzma2.c) = 9b9be69e60e17b81f4e776579b093d429ac7e22c
-SHA1 (patch-grub-core_loader_i386_pc_plan9.c) = 07c909c02210ef59647185cd9b7f43b35d58515c
-SHA1 (patch-grub-core_net_bootp.c) = 4ba82627a38f1942d3a289eba191f46e0e22603f
-SHA1 (patch-grub-core_script_yylex.l) = 1645d167b90d1862b2d9990dfe7c357778d9a952
+SHA1 (patch-grub-core_osdep_bsd_hostdisk.c) = 274ea8c2f22e65b6bc59c7851d5da5ff0a978c79
 SHA1 (patch-stpcpy-1.diff) = d31f8d607900fdde950d3828279d5b3b09812a39
 SHA1 (patch-stpcpy-2-gen.diff) = 8b2d08cfe798386eec7d70a3946e7a9430e75254
-SHA1 (patch-util_getroot.c) = 009b499772c864cc82dee75658442a071327a1c9
-SHA1 (patch-util_grub-mkfont.c) = c93b8497672ea038f65af7d8cf0db021fd023761
-SHA1 (patch-util_grub.d_10__netbsd.in) = c7ad93fc60594233d71962e625320091d8cc67e5
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure	29 Jul 2012 21:44:13 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2012/07/29 21:44:13 gsutre Exp $
-
-Strengthen the test for working -nostdinc -isystem.  Otherwise,
-configure believes that -nostdinc -isystem works with gcc44, which
-makes the build fail afterwards (for a file including stddef.h).
-
---- configure.orig	2012-06-26 11:59:16.000000000 +0000
-+++ configure
-@@ -21169,6 +21169,7 @@ else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <stdarg.h>
-+#include <stddef.h>
- int va_arg_func (int fixed, va_list args);
- int
- main (void)
Index: patches/patch-grub-core_lib_posix__wrap_sys_types.h
===================================================================
RCS file: patches/patch-grub-core_lib_posix__wrap_sys_types.h
diff -N patches/patch-grub-core_lib_posix__wrap_sys_types.h
--- patches/patch-grub-core_lib_posix__wrap_sys_types.h	29 Jul 2012 21:44:13 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-grub-core_lib_posix__wrap_sys_types.h,v 1.1 2012/07/29 21:44:13 gsutre Exp $
-
-Include stddef rather than defining size_t to avoid conflict.
-
---- grub-core/lib/posix_wrap/sys/types.h.orig	2012-05-28 15:52:37.000000000 +0000
-+++ grub-core/lib/posix_wrap/sys/types.h
-@@ -21,7 +21,7 @@
- 
- #include <grub/misc.h>
- 
--#ifndef __APPLE__
-+#if !(defined(__APPLE__) || defined(__NetBSD__))
- typedef grub_size_t size_t;
- #else
- #include <stddef.h>
Index: patches/patch-grub-core_lib_posix__wrap_wchar.h
===================================================================
RCS file: patches/patch-grub-core_lib_posix__wrap_wchar.h
diff -N patches/patch-grub-core_lib_posix__wrap_wchar.h
--- patches/patch-grub-core_lib_posix__wrap_wchar.h	29 Jul 2012 21:44:13 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-grub-core_lib_posix__wrap_wchar.h,v 1.1 2012/07/29 21:44:13 gsutre Exp $
-
-Include stddef rather than defining wchar_t to avoid conflict.
-
---- grub-core/lib/posix_wrap/wchar.h.orig	2012-02-08 20:34:24.000000000 +0000
-+++ grub-core/lib/posix_wrap/wchar.h
-@@ -29,7 +29,11 @@ enum
-   };
- 
- /* UCS-4.  */
-+#if !defined(__NetBSD__)
- typedef grub_int32_t wchar_t;
-+#else
-+#include <stddef.h>
-+#endif
- 
- typedef struct mbstate {
-   grub_uint32_t code;
Index: patches/patch-grub-core_lib_xzembed_xz__dec__lzma2.c
===================================================================
RCS file: patches/patch-grub-core_lib_xzembed_xz__dec__lzma2.c
diff -N patches/patch-grub-core_lib_xzembed_xz__dec__lzma2.c
--- patches/patch-grub-core_lib_xzembed_xz__dec__lzma2.c	5 Sep 2014 12:14:24 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-grub-core_lib_xzembed_xz__dec__lzma2.c,v 1.1 2014/09/05 12:14:24 gsutre Exp $
-
-Make -Wattributes not cause error.
-Upstream commit 64463dfde40b4cf5e551899d656d3ef50b7a008a.
-
---- grub-core/lib/xzembed/xz_dec_lzma2.c.orig	2010-12-01 14:45:43.000000000 +0000
-+++ grub-core/lib/xzembed/xz_dec_lzma2.c
-@@ -24,6 +24,8 @@
- #include "xz_private.h"
- #include "xz_lzma2.h"
- 
-+#pragma GCC diagnostic warning "-Wattributes"
-+
- /*
-  * Range decoder initialization eats the first five bytes of each LZMA chunk.
-  */
Index: patches/patch-grub-core_loader_i386_pc_plan9.c
===================================================================
RCS file: patches/patch-grub-core_loader_i386_pc_plan9.c
diff -N patches/patch-grub-core_loader_i386_pc_plan9.c
--- patches/patch-grub-core_loader_i386_pc_plan9.c	29 Jul 2012 21:44:13 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-grub-core_loader_i386_pc_plan9.c,v 1.1 2012/07/29 21:44:13 gsutre Exp $
-
-Prevent warning with lang/gcc44, leading to build failure.
-
---- grub-core/loader/i386/pc/plan9.c.orig	2012-03-04 00:00:08.000000000 +0000
-+++ grub-core/loader/i386/pc/plan9.c
-@@ -102,6 +102,8 @@ grub_plan9_unload (void)
-   return GRUB_ERR_NONE;
- }
- 
-+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-+
- static grub_err_t
- grub_cmd_plan9 (grub_extcmd_context_t ctxt, int argc, char *argv[])
- {
Index: patches/patch-grub-core_net_bootp.c
===================================================================
RCS file: patches/patch-grub-core_net_bootp.c
diff -N patches/patch-grub-core_net_bootp.c
--- patches/patch-grub-core_net_bootp.c	3 May 2016 14:53:14 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-grub-core_net_bootp.c,v 1.1 2016/05/03 14:53:14 nonaka Exp $
-
---- grub-core/net/bootp.c.orig  2012-06-22 05:15:48.000000000 +0900
-+++ grub-core/net/bootp.c       2016-04-27 22:57:02.990825737 +0900
-@@ -52,9 +52,9 @@ set_env_limn_ro (const char *intername,
- }
-
- static void
--parse_dhcp_vendor (const char *name, void *vend, int limit, int *mask)
-+parse_dhcp_vendor (const char *name, const void *vend, int limit, int *mask)
- {
--  grub_uint8_t *ptr, *ptr0;
-+  const grub_uint8_t *ptr, *ptr0;
-
-   ptr = ptr0 = vend;
-
Index: patches/patch-grub-core_osdep_bsd_hostdisk.c
===================================================================
RCS file: patches/patch-grub-core_osdep_bsd_hostdisk.c
diff -N patches/patch-grub-core_osdep_bsd_hostdisk.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-grub-core_osdep_bsd_hostdisk.c	15 May 2017 13:46:28 -0000
@@ -0,0 +1,47 @@
+$NetBSD$
+
+--- grub-core/osdep/bsd/hostdisk.c.orig	2015-05-21 15:50:29.000000000 +0000
++++ grub-core/osdep/bsd/hostdisk.c
+@@ -50,6 +50,9 @@
+ # endif /* HAVE_GETRAWPARTITION */
+ # if defined(__NetBSD__)
+ # include <sys/fdio.h>
++# ifndef RAW_FLOPPY_MAJOR
++#  define RAW_FLOPPY_MAJOR 9
++# endif /* ! RAW_FLOPPY_MAJOR */
+ # endif
+ # if defined(__OpenBSD__)
+ # include <sys/dkio.h>
+@@ -61,7 +64,7 @@
+    floppy driver from retrying operations on failure, as otherwise the
+    driver takes a while to abort when there is no floppy in the drive.  */
+ static void
+-configure_device_driver (grub_util_fd_t fd)
++grub_hostdisk_configure_device_driver (grub_util_fd_t fd)
+ {
+   struct stat st;
+ 
+@@ -81,7 +84,7 @@ configure_device_driver (grub_util_fd_t 
+ grub_util_fd_t
+ grub_util_fd_open (const char *os_dev, int flags)
+ {
+-  grub_util_fd_t ret;
++  grub_util_fd_t fd;
+ 
+ #ifdef O_LARGEFILE
+   flags |= O_LARGEFILE;
+@@ -90,10 +93,10 @@ grub_util_fd_open (const char *os_dev, i
+   flags |= O_BINARY;
+ #endif
+ 
+-  ret = open (os_dev, flags, S_IROTH | S_IRGRP | S_IRUSR | S_IWUSR);
+-  if (ret >= 0)
+-    configure_device_driver (fd);
+-  return ret;
++  fd = open (os_dev, flags, S_IROTH | S_IRGRP | S_IRUSR | S_IWUSR);
++  if (fd >= 0)
++    grub_hostdisk_configure_device_driver (fd);
++  return fd;
+ }
+ 
+ #endif
Index: patches/patch-grub-core_script_yylex.l
===================================================================
RCS file: patches/patch-grub-core_script_yylex.l
diff -N patches/patch-grub-core_script_yylex.l
--- patches/patch-grub-core_script_yylex.l	12 Aug 2012 13:15:12 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$NetBSD: patch-grub-core_script_yylex.l,v 1.1 2012/08/12 13:15:12 marino Exp $
-
-Fix grub_script.yy.c errors:
-* 'yy_fatal_error' defined but not used
-* In function 'yy_scan_bytes':
-  comparison between signed and unsigned integer expression 
-
---- grub-core/script/yylex.l.orig	2012-06-08 20:24:15.000000000 +0000
-+++ grub-core/script/yylex.l
-@@ -29,6 +29,7 @@
- #pragma GCC diagnostic ignored "-Wmissing-prototypes"
- #pragma GCC diagnostic ignored "-Wmissing-declarations"
- #pragma GCC diagnostic ignored "-Wunsafe-loop-optimizations"
-+#pragma GCC diagnostic ignored "-Wsign-compare"
- 
- #define yyfree    grub_lexer_yyfree
- #define yyalloc   grub_lexer_yyalloc
-@@ -38,10 +39,6 @@
-  * As we don't have access to yyscanner, we cannot do much except to
-  * print the fatal error.
-  */
--#define YY_FATAL_ERROR(msg)                     \
--  do {                                          \
--    grub_printf (_("fatal error: %s\n"), _(msg));     \
--  } while (0)
- 
- #define COPY(str, hint)                         \
-   do {                                          \
Index: patches/patch-stpcpy-1.diff
===================================================================
RCS file: patches/patch-stpcpy-1.diff
diff -N patches/patch-stpcpy-1.diff
--- patches/patch-stpcpy-1.diff	29 Jul 2012 21:44:13 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,176 +0,0 @@
-$NetBSD: patch-stpcpy-1.diff,v 1.1 2012/07/29 21:44:13 gsutre Exp $
-
-Add gnulib's stpcpy.
-
-=== modified file 'grub-core/gnulib/Makefile.am'
---- grub-core/gnulib/Makefile.am	2010-09-20 23:09:23 +0000
-+++ grub-core/gnulib/Makefile.am	2012-07-28 13:09:43 +0000
-@@ -9,7 +9,7 @@
- # the same distribution terms as the rest of that program.
- #
- # Generated by gnulib-tool.
--# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=grub-core/gnulib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-libtool --macro-prefix=gl --no-vc-files argp error fnmatch getdelim getline gettext progname regex
-+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=grub-core/gnulib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-libtool --macro-prefix=gl --no-vc-files argp error fnmatch getdelim getline gettext progname regex stpcpy
- 
- AUTOMAKE_OPTIONS = 1.5 gnits
- 
-@@ -859,6 +859,15 @@
- 
- ## end   gnulib module stdlib
- 
-+## begin gnulib module stpcpy
-+
-+
-+EXTRA_DIST += stpcpy.c
-+
-+EXTRA_libgnu_a_SOURCES += stpcpy.c
-+
-+## end   gnulib module stpcpy
-+
- ## begin gnulib module strcase
- 
- 
-
-=== added file 'grub-core/gnulib/stpcpy.c'
---- grub-core/gnulib/stpcpy.c	1970-01-01 00:00:00 +0000
-+++ grub-core/gnulib/stpcpy.c	2012-07-28 13:09:38 +0000
-@@ -0,0 +1,49 @@
-+/* stpcpy.c -- copy a string and return pointer to end of new string
-+   Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2010 Free Software
-+   Foundation, Inc.
-+
-+   NOTE: The canonical source of this file is maintained with the GNU C Library.
-+   Bugs can be reported to bug-glibc%prep.ai.mit.edu@localhost.
-+
-+   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 3 of the License, or 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/>.  */
-+
-+#include <config.h>
-+
-+#include <string.h>
-+
-+#undef __stpcpy
-+#ifdef _LIBC
-+# undef stpcpy
-+#endif
-+
-+#ifndef weak_alias
-+# define __stpcpy stpcpy
-+#endif
-+
-+/* Copy SRC to DEST, returning the address of the terminating '\0' in DEST.  */
-+char *
-+__stpcpy (char *dest, const char *src)
-+{
-+  register char *d = dest;
-+  register const char *s = src;
-+
-+  do
-+    *d++ = *s;
-+  while (*s++ != '\0');
-+
-+  return d - 1;
-+}
-+#ifdef weak_alias
-+weak_alias (__stpcpy, stpcpy)
-+#endif
-
-=== modified file 'm4/gnulib-cache.m4'
---- m4/gnulib-cache.m4	2010-09-20 23:09:23 +0000
-+++ m4/gnulib-cache.m4	2012-07-28 13:09:43 +0000
-@@ -15,7 +15,7 @@
- 
- 
- # Specification in the form of a command-line invocation:
--#   gnulib-tool --import --dir=. --lib=libgnu --source-base=grub-core/gnulib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-libtool --macro-prefix=gl --no-vc-files argp error fnmatch getdelim getline gettext progname regex
-+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=grub-core/gnulib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-libtool --macro-prefix=gl --no-vc-files argp error fnmatch getdelim getline gettext progname regex stpcpy
- 
- # Specification in the form of a few gnulib-tool.m4 macro invocations:
- gl_LOCAL_DIR([])
-@@ -28,6 +28,7 @@
-   gettext
-   progname
-   regex
-+  stpcpy
- ])
- gl_AVOID([])
- gl_SOURCE_BASE([grub-core/gnulib])
-
-=== modified file 'm4/gnulib-comp.m4'
---- m4/gnulib-comp.m4	2010-09-20 23:09:23 +0000
-+++ m4/gnulib-comp.m4	2012-07-28 13:09:44 +0000
-@@ -73,6 +73,7 @@
-   # Code from module stdint:
-   # Code from module stdio:
-   # Code from module stdlib:
-+  # Code from module stpcpy:
-   # Code from module strcase:
-   # Code from module strchrnul:
-   # Code from module streq:
-@@ -221,6 +222,9 @@
-   gl_STDIO_H
-   # Code from module stdlib:
-   gl_STDLIB_H
-+  # Code from module stpcpy:
-+  gl_FUNC_STPCPY
-+  gl_STRING_MODULE_INDICATOR([stpcpy])
-   # Code from module strcase:
-   gl_STRCASE
-   # Code from module strchrnul:
-@@ -482,6 +486,7 @@
-   lib/stdio-write.c
-   lib/stdio.in.h
-   lib/stdlib.in.h
-+  lib/stpcpy.c
-   lib/strcasecmp.c
-   lib/strchrnul.c
-   lib/strchrnul.valgrind
-@@ -576,6 +581,7 @@
-   m4/stdint_h.m4
-   m4/stdio_h.m4
-   m4/stdlib_h.m4
-+  m4/stpcpy.m4
-   m4/strcase.m4
-   m4/strchrnul.m4
-   m4/strerror.m4
-
-=== added file 'm4/stpcpy.m4'
---- m4/stpcpy.m4	1970-01-01 00:00:00 +0000
-+++ m4/stpcpy.m4	2012-07-28 13:09:38 +0000
-@@ -0,0 +1,26 @@
-+# stpcpy.m4 serial 7
-+dnl Copyright (C) 2002, 2007, 2009, 2010 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
-+dnl gives unlimited permission to copy and/or distribute it,
-+dnl with or without modifications, as long as this notice is preserved.
-+
-+AC_DEFUN([gl_FUNC_STPCPY],
-+[
-+  dnl Persuade glibc <string.h> to declare stpcpy().
-+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-+
-+  dnl The stpcpy() declaration in lib/string.in.h uses 'restrict'.
-+  AC_REQUIRE([AC_C_RESTRICT])
-+
-+  AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
-+  AC_REPLACE_FUNCS([stpcpy])
-+  if test $ac_cv_func_stpcpy = no; then
-+    HAVE_STPCPY=0
-+    gl_PREREQ_STPCPY
-+  fi
-+])
-+
-+# Prerequisites of lib/stpcpy.c.
-+AC_DEFUN([gl_PREREQ_STPCPY], [
-+  :
-+])
Index: patches/patch-stpcpy-2-gen.diff
===================================================================
RCS file: patches/patch-stpcpy-2-gen.diff
diff -N patches/patch-stpcpy-2-gen.diff
--- patches/patch-stpcpy-2-gen.diff	29 Jul 2012 21:44:13 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,177 +0,0 @@
-$NetBSD: patch-stpcpy-2-gen.diff,v 1.1 2012/07/29 21:44:13 gsutre Exp $
-
-Add gnulib's stpcpy.  Generated files only.
-
-diff -Naurp grub-2.00/Makefile.in grub-2.00.stpcpy/Makefile.in
---- Makefile.in	2012-06-26 14:12:41.000000000 +0200
-+++ Makefile.in	2012-07-28 16:02:25.351302756 +0200
-@@ -6070,7 +6070,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/0
- 	$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \
- 	$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
- 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \
--	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strcase.m4 \
-+	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \
- 	$(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strerror.m4 \
- 	$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \
- 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-diff -Naurp grub-2.00/aclocal.m4 grub-2.00.stpcpy/aclocal.m4
---- aclocal.m4	2012-06-26 13:59:13.000000000 +0200
-+++ aclocal.m4	2012-07-28 15:57:51.202749270 +0200
-@@ -1088,6 +1088,7 @@ m4_include([m4/stdint.m4])
- m4_include([m4/stdint_h.m4])
- m4_include([m4/stdio_h.m4])
- m4_include([m4/stdlib_h.m4])
-+m4_include([m4/stpcpy.m4])
- m4_include([m4/strcase.m4])
- m4_include([m4/strchrnul.m4])
- m4_include([m4/strerror.m4])
-diff -Naurp grub-2.00/configure grub-2.00.stpcpy/configure
---- configure	2012-06-26 13:59:16.000000000 +0200
-+++ configure	2012-07-28 15:57:56.658680680 +0200
-@@ -6778,6 +6778,7 @@ $as_echo "$ac_cv_safe_to_define___extens
-   # Code from module stdint:
-   # Code from module stdio:
-   # Code from module stdlib:
-+  # Code from module stpcpy:
-   # Code from module strcase:
-   # Code from module strchrnul:
-   # Code from module streq:
-@@ -17952,6 +17953,55 @@ fi
-       done
- 
- 
-+  # Code from module stpcpy:
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+  for ac_func in stpcpy
-+do :
-+  ac_fn_c_check_func "$LINENO" "stpcpy" "ac_cv_func_stpcpy"
-+if test "x$ac_cv_func_stpcpy" = xyes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_STPCPY 1
-+_ACEOF
-+
-+else
-+
-+    gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext"
-+
-+fi
-+done
-+
-+
-+  if test $ac_cv_func_stpcpy = no; then
-+    HAVE_STPCPY=0
-+
-+  :
-+
-+  fi
-+
-+
-+
-+
-+  GNULIB_STPCPY=1
-+
-+
-+
-+$as_echo "#define GNULIB_TEST_STPCPY 1" >>confdefs.h
-+
-+
-+
-   # Code from module strcase:
- 
- 
-diff -Naurp grub-2.00/docs/Makefile.in grub-2.00.stpcpy/docs/Makefile.in
---- docs/Makefile.in	2012-06-26 13:59:17.000000000 +0200
-+++ docs/Makefile.in	2012-07-28 16:02:37.319152299 +0200
-@@ -89,7 +89,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/0
- 	$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \
- 	$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
- 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \
--	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strcase.m4 \
-+	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \
- 	$(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strerror.m4 \
- 	$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \
- 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-diff -Naurp grub-2.00/grub-core/Makefile.in grub-2.00.stpcpy/grub-core/Makefile.in
---- grub-core/Makefile.in	2012-06-26 14:12:27.000000000 +0200
-+++ grub-core/Makefile.in	2012-07-28 16:02:31.483225667 +0200
-@@ -23878,7 +23878,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/0
- 	$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \
- 	$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
- 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \
--	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strcase.m4 \
-+	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \
- 	$(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strerror.m4 \
- 	$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \
- 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-diff -Naurp grub-2.00/grub-core/gnulib/Makefile.in grub-2.00.stpcpy/grub-core/gnulib/Makefile.in
---- grub-core/gnulib/Makefile.in	2012-06-26 14:00:29.000000000 +0200
-+++ grub-core/gnulib/Makefile.in	2012-07-28 16:05:07.073269635 +0200
-@@ -24,7 +24,7 @@
- # the same distribution terms as the rest of that program.
- #
- # Generated by gnulib-tool.
--# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=grub-core/gnulib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-libtool --macro-prefix=gl --no-vc-files argp error fnmatch getdelim getline gettext progname regex
-+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=grub-core/gnulib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-libtool --macro-prefix=gl --no-vc-files argp error fnmatch getdelim getline gettext progname regex stpcpy
- 
- 
- 
-@@ -101,7 +101,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/0
- 	$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \
- 	$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
- 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \
--	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strcase.m4 \
-+	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \
- 	$(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strerror.m4 \
- 	$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \
- 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
-@@ -843,7 +843,7 @@ EXTRA_DIST = alloca.c alloca.in.h \
- 	rawmemchr.valgrind realloc.c regcomp.c regex.c regex.h \
- 	regex_internal.c regex_internal.h regexec.c sleep.c \
- 	stdbool.in.h stddef.in.h stdint.in.h stdio-write.c stdio.in.h \
--	stdlib.in.h strcasecmp.c strncasecmp.c strchrnul.c \
-+	stdlib.in.h stpcpy.c strcasecmp.c strncasecmp.c strchrnul.c \
- 	strchrnul.valgrind streq.h strerror.c string.in.h strings.in.h \
- 	strndup.c strnlen.c sys_wait.in.h sysexits.in.h unistd.in.h \
- 	asnprintf.c float+.h printf-args.c printf-args.h \
-@@ -904,7 +904,7 @@ EXTRA_libgnu_a_SOURCES = alloca.c btowc.
- 	mbrtowc.c mbsinit.c mbsrtowcs-state.c mbsrtowcs.c memchr.c \
- 	mempcpy.c nl_langinfo.c rawmemchr.c realloc.c regcomp.c \
- 	regex.c regex_internal.c regexec.c sleep.c stdio-write.c \
--	strcasecmp.c strncasecmp.c strchrnul.c strerror.c strndup.c \
-+	stpcpy.c strcasecmp.c strncasecmp.c strchrnul.c strerror.c strndup.c \
- 	strnlen.c asnprintf.c printf-args.c printf-parse.c \
- 	vasnprintf.c vsnprintf.c wcrtomb.c
- ARG_NONNULL_H = arg-nonnull.h
-@@ -1013,6 +1013,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regexec.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sleep.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdio-write.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stpcpy.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strcasecmp.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strchrnul.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror.Po@am__quote@
-diff -Naurp grub-2.00/util/bash-completion.d/Makefile.in grub-2.00.stpcpy/util/bash-completion.d/Makefile.in
---- util/bash-completion.d/Makefile.in	2012-06-26 14:00:29.000000000 +0200
-+++ util/bash-completion.d/Makefile.in	2012-07-28 16:02:28.407264338 +0200
-@@ -87,7 +87,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/0
- 	$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \
- 	$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
- 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \
--	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strcase.m4 \
-+	$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \
- 	$(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strerror.m4 \
- 	$(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \
- 	$(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \
Index: patches/patch-util_getroot.c
===================================================================
RCS file: patches/patch-util_getroot.c
diff -N patches/patch-util_getroot.c
--- patches/patch-util_getroot.c	5 Sep 2014 12:14:24 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-util_getroot.c,v 1.1 2014/09/05 12:14:24 gsutre Exp $
-
-Fix grub-emu build.
-
-* exec_pipe: Define only on Linux or when either libzfs or libnvpair is unavailable.
-* find_root_devices_from_poolname: Remove unused path variable.
-
-Taken from upstream commit 794c8c33758792627113ae98ec495b9856960d92.
-
---- util/getroot.c.orig	2012-06-22 15:42:07.000000000 +0000
-+++ util/getroot.c
-@@ -220,6 +220,9 @@ xgetcwd (void)
- 
- #if !defined (__MINGW32__) && !defined (__CYGWIN__) && !defined (__GNU__)
- 
-+#if (defined (__linux__) || \
-+     !defined (HAVE_LIBZFS) || !defined (HAVE_LIBNVPAIR))
-+
- static pid_t
- exec_pipe (char **argv, int *fd)
- {
-@@ -258,6 +261,8 @@ exec_pipe (char **argv, int *fd)
-     }
- }
- 
-+#endif
-+
- static char **
- find_root_devices_from_poolname (char *poolname)
- {
-@@ -269,7 +274,7 @@ find_root_devices_from_poolname (char *p
-   zpool_handle_t *zpool;
-   libzfs_handle_t *libzfs;
-   nvlist_t *config, *vdev_tree;
--  nvlist_t **children, **path;
-+  nvlist_t **children;
-   unsigned int nvlist_count;
-   unsigned int i;
-   char *device = 0;
Index: patches/patch-util_grub-mkfont.c
===================================================================
RCS file: patches/patch-util_grub-mkfont.c
diff -N patches/patch-util_grub-mkfont.c
--- patches/patch-util_grub-mkfont.c	11 Jul 2014 10:58:43 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-util_grub-mkfont.c,v 1.1 2014/07/11 10:58:43 jperkin Exp $
-
-Fix ftsynth.h include.
-
---- util/grub-mkfont.c.orig	2012-03-10 12:17:57.000000000 +0000
-+++ 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[] = { 
Index: patches/patch-util_grub.d_10__netbsd.in
===================================================================
RCS file: patches/patch-util_grub.d_10__netbsd.in
diff -N patches/patch-util_grub.d_10__netbsd.in
--- patches/patch-util_grub.d_10__netbsd.in	29 Jul 2012 21:44:13 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$NetBSD: patch-util_grub.d_10__netbsd.in,v 1.1 2012/07/29 21:44:13 gsutre Exp $
-
-Make sure that /netbsd is the main boot menu entry.
-Fix indentation for filesystem module.
-
---- util/grub.d/10_netbsd.in.orig	2012-07-25 13:23:50.000000000 +0000
-+++ util/grub.d/10_netbsd.in
-@@ -74,13 +74,13 @@ netbsd_load_fs_module ()
-   fi
- 
-   kmodule_rel=$(make_system_path_relative_to_its_root "$kmodule") || return
--  prepare_grub_to_access_device $(${grub_probe} -t device "${kmodule}") | sed -e 's,^,	,'
-+  prepare_grub_to_access_device $(${grub_probe} -t device "${kmodule}") | sed -e 's,^,	,' | sed "s/^/$submenu_indentation/"
-   case "${loader}" in
-     knetbsd)
--      printf "\tknetbsd_module_elf %s\n" "${kmodule_rel}"
-+      printf "\tknetbsd_module_elf %s\n" "${kmodule_rel}" | sed "s/^/$submenu_indentation/"
-       ;;
-     multiboot)
--      printf "\tmodule %s\n" "${kmodule_rel}"
-+      printf "\tmodule %s\n" "${kmodule_rel}" | sed "s/^/$submenu_indentation/"
-       ;;
-   esac
- }
-@@ -147,7 +147,7 @@ pattern="^ELF[^,]*executable.*statically
- submenu_indentation=""
- 
- is_first_entry=true
--for k in $(ls -t /netbsd*) ; do
-+for k in /netbsd $(ls -t /netbsd?* 2>/dev/null) ; do
-   if ! grub_file_is_not_garbage "$k" ; then
-     continue
-   fi

New in 2.02:

* New/improved filesystem and disk support:
  * Big-endian UFS1.
  * Experimental 64-bit ext2 support.
  * Various fixes for non-512-byte sector devices.
  * New `proc' filesystem framework, used by LUKS disks.
  * Fix DM-RAID partition handling.
  * New `nativedisk' command to switch from firmware to native disk drivers.
  * Compressed HFS+.
  * DragonFly BSD labels.
  * CBFS (coreboot).
  * Handle partitioned LVM properly.
  * Use LVM UUIDs whenever possible.
  * GPT PReP.
  * New `progress' module that shows progress information while reading
    files.
  * ZFS features support.
  * ZFS LZ4 support.
  * XFS V5 format support.
  * LVM RAID1 support.

* New/improved terminal and video support:
  * Monochrome text (matching `hercules' in GRUB Legacy).
  * Morse code output using system speaker.
  * `spkmodem' output (simple data protocol using system speaker).
  * Handle Japanese special keys.
  * coreboot framebuffer.
  * Serial on ARC.
  * Native vt100 handling for grub-emu, replacing the use of the curses
    library.
  * New gfxmenu options for terminal window positioning, theme background
    image handling, and scrollbar padding, plus `item_pixmap_style' and
    `highlight_overlay'.
  * Support several more image types (paletted and greyscale).

* Boot protocol improvements:
  * Support Apple FAT binaries on non-Apple platforms.
  * Improve FreeDOS direct loading support compatibility.
  * Enable `linux16' on all x86 platforms, not just BIOS.
  * New TrueCrypt ISO loader.
  * multiboot2 boot-services EFI specification.
  * multiboot2 EFI memory map specification.
  * multiboot2 full-file specfication.

* New/improved network support:
  * New variables `net_default_*' containing properties of the default
    interface.
  * Autoload `http' and `tftp' modules if necessary.
  * Improve TFTP robustness.
  * Parse `nd' disk names in GRUB Legacy configuration files.
  * Issue separate DNS queries for IPv4 and IPv6.
  * Support IPv6 Router Advertisement to configure default router.
  * New variable net_<interface>_next_server containing next server
    from BOOTP reply.

* Coreboot improvements:
  * CBFS support both in on-disk images (loopback) and flash.
  * Ability to launch another payload from flash or disk
  * Coreboot framebuffer
  * CBMEMC support (both logging and inspecting logs)
  * Command for inspecting coreboot timestamps (`coreboot_boottime').
  * Command for inspecting coreboot tables (`lscoreboot').
  * New target default_payload.elf.
  * Increased maximal core size.
  * Prefer pmtimer for TSC calibration.

* New/improved platform support:
  * New `efifwsetup' and `lsefi' commands on EFI platforms.
  * New `cmosdump' and `cmosset' commands on platforms with CMOS support.
  * New command `pcidump' for PCI platforms.
  * Improve opcode parsing in ACPI halt implementation.
  * Use the TSC as a possible time source on i386-ieee1275.
  * Merge PowerPC grub-mkrescue implementation with the common one.
  * Support grub-mkrescue on i386-ieee1275, sparc64, bootinfo machines such
    as pSeries, and mips-arc.
  * Make grub-mkrescue better support Apple Intel Macs on CD.
  * Enable GRUB Legacy configuration file parsing on EFI.
  * Support halt for Loongson 2E.
  * ARM U-Boot and EFI ports.
  * Reorganise platform-dependent code in utilities to avoid #ifdef mess.
  * AROS and Haiku support for userspace utilities.
  * Xen PV port.
  * Fix EFI stack alignment.
  * ARM64 EFI port.
  * On Linux, read partition start offsets from sysfs if possible.
  * New grub-macbless utility, and better integration with Mac firmware in
    grub-install.
  * Support Yeeloong 3A.
  * Add `cpuid --pae' option to detect Physical Address Extension on x86.
  * Support for USB debug dongles.
  * Support for *-emu on all platforms (previously only i386/x86_64 worked).
  * Support *-emu on Windows.
  * New platform `none' which builds only user level utilities. This is now
    default if target CPU is not supported.
  * Support for booting little-endian Linux kernel on powerpc.
  * Support network boot with Oracle sun4v vnet devices.
  * Added SAS disks to the IEEE 1275 Open Firmware device list.
  * Try multiple methods for TSC (timestamp counter) calibration - PIT, pmtimer,
    EFI Stall. If everything fails, use hardcoded frequency 800MHz.
  * Support Hyper-V Gen2 platforms which lack PIT for TSC calibration.
  * Map UEFI Persistent Memory to E820 persistent memory.
  * New Xen loader on ARM64.
  * Respect alignment requirement for block device IO buffers on EFI.

* Security:
  * Add optional facility to enforce that all files read by the core image
    from disk have a valid detached digital signature.

* Performance:
  * Avoid costly division operations in many places.
  * New boot time analysis framework (`./configure --enable-boot-time').
  * Initialise USB ports in parallel.
  * New `testspeed' command to test file read speed.
  * Speed-up gfxterm by storing intermediate results in more compact format.
  * Lazy LVM/mdraid scan.
  * Disk hints.

* Scripting:
  * New `eval' and `tr' commands.
  * grub-script-check fails on scripts containing no commands.

* Installation and other utility improvements:
  * Add option to compress files on installation or image creation.
  * Using grub-reboot no longer requires setting `GRUB_DEFAULT=saved'.
  * Support probing EFI System Partition (requires os-prober >= 1.58).
  * Fix inconsistent use of `GRUB_CRYPTODISK_ENABLE' and
    `GRUB_ENABLE_CRYPTODISK'; the latter is now used consistently.
  * grub-mount handles symbolic links to directories.
  * Support disabling submenus with `GRUB_DISABLE_SUBMENU' configuration key
    for grub-mkconfig.
  * grub-install, grub-mknetdir, grub-mkrescue, and grub-mkstandalone
    rewritten in C.  They should now work in supported non-Unix-like
    environments.
  * Native mingw support.
  * Ability to install on EFI under windows.
  * Reorganise timeout handling using new `timeout_style' environment
    variable and `GRUB_TIMEOUT_STYLE' configuration key for grub-mkconfig.
    Menu hotkeys pressed during a hidden timeout now boot the corresponding
    menu entry immediately.
  * New `file' command and grub-file utility to check file types.
  * New syslinux configuration file parser.
  * Set menu entry class to primary OS name returned by os-prober to display
    OS specific icon.
  * On Linux x86 detect EFI word size in grub-install and automatically select
    correct platform (x86_64-efi or i386-efi) to install. Requires Linux kernel
    4.0 or higher.

* Build system:
  * Remove all uses of nested functions; GRUB no longer requires an
    executable stack.
  * Fix documentation build with Texinfo >= 5.1.
  * More robust and documented cross-compiling support.
  * Partial clang support for some platforms (experimental).
  * Partial mingw64 x86_64-efi compile support (highly experimental).
  * Partial mingw32 i386-* (other than already present i386-pc)
    compile support (highly experimental).
  * Support for grub-mkpasswd on Windows.
  * Eliminate the use of AutoGen.  This allowed some performance
    improvements to the build system.
  * Remove variable length arrays.
  * OpenBSD compile and tools support (NetBSD and FreeBSD were already supported).
  * Fix build with FreeType >= 2.5.1.
  * Make gentpl.py compatible with Python 3.  It now requires at least
    Python 2.6.
  * modinfo.sh contains build information now.
  * Added many new tests to improve robustness.
  * Target is built without libgcc now. Necessary builtins are reimplemented
    directly. This removes requirement for target-specific runtime on build
    system.
  * emu libusb support removed (was broken and unmaintained).
  * powerpc64le compile support.
  * Use fixed timestamp when generating GRUB image for reproducible builds.
  * Verify at build time that modules contain only supported relocations and their
    structure matches what boot-time module loader expects.
  * Do not require fonts on powerpc-ieee1275.

* Revision control moved to git.




Home | Main Index | Thread Index | Old Index