Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update sysutils/grub2-efi to the 2.02 prerelease version as well

  • Loading branch information...
commit 0a8a42dcf20e3c3719cd4768c05a77cb8abba6fd 1 parent 54456a1
@kmoore134 kmoore134 authored
Showing with 112 additions and 1,782 deletions.
  1. +0 −11 emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk
  2. +0 −12 emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
  3. +0 −11 emulators/virtualbox-ose/files/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk
  4. +0 −10 emulators/virtualbox-ose/files/extrapatch-src-recompiler-Makefile.kmk
  5. +0 −29 emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-DrvACPI.cpp
  6. +0 −11 emulators/virtualbox-ose/files/patch-src-VBox-Devices-Storage-DevAHCI.cpp
  7. +0 −36 emulators/virtualbox-ose/files/patch-src-VBox-Main-src-client-ConsoleImpl2.cpp
  8. +0 −47 emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-MachineImpl.cpp
  9. +0 −11 emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-VirtualBoxImpl.cpp
  10. +0 −14 emulators/virtualbox-ose/files/patch-src-VBox-Runtime-common-misc-uri.cpp
  11. +0 −11 emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-freebsd-fileaio-freebsd.cpp
  12. +0 −29 emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-freebsd-mp-freebsd.cpp
  13. +7 −4 sysutils/grub2-efi/Makefile
  14. +2 −2 sysutils/grub2-efi/distinfo
  15. +0 −254 sysutils/grub2-efi/files/patch-Makefile.util.am
  16. +0 −11 sysutils/grub2-efi/files/patch-Makefile.util.def
  17. +0 −130 sysutils/grub2-efi/files/patch-build-aux_test-driver
  18. +0 −35 sysutils/grub2-efi/files/patch-configure.ac
  19. +0 −893 sysutils/grub2-efi/files/patch-grub-2.00-zfs-feature-flag-support
  20. +0 −128 sysutils/grub2-efi/files/patch-grub-core-Makefile.core.am
  21. +0 −18 sysutils/grub2-efi/files/patch-grub-core-gnulib-Makefile.am
  22. +0 −14 sysutils/grub2-efi/files/patch-grub-core-gnulib-argp-fmtstream.c
  23. +0 −49 sysutils/grub2-efi/files/patch-grub-core-loader-i386-bsd.c
  24. +11 −0 sysutils/grub2-efi/files/patch-grub-core_lib_libgcrypt-grub_src_types.h
  25. +0 −12 sysutils/grub2-efi/files/patch-include-grub-util-libzfs.h
  26. +92 −0 sysutils/grub2-efi/pkg-plist
View
11 emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk
@@ -1,11 +0,0 @@
---- src/VBox/Additions/x11/VBoxClient/Makefile.kmk.orig 2013-11-29 14:20:43.000000000 -0500
-+++ src/VBox/Additions/x11/VBoxClient/Makefile.kmk 2013-12-16 14:03:08.000000000 -0500
-@@ -50,7 +50,7 @@
- # Xtst
- # These are static replacements for gcc-specific parts of libstdc++
- VBoxClient_LIBS += \
-- supc++ \
-+ cxxrt \
- gcc_eh
- ifdef VBOX_X11_SEAMLESS_GUEST
- VBoxClient_DEFS += SEAMLESS_GUEST DYNAMIC_RESIZE
View
12 emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
@@ -1,12 +0,0 @@
---- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2013-11-29 14:20:43.000000000 -0500
-+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2013-12-16 13:47:34.000000000 -0500
-@@ -27,6 +27,9 @@
-
- vboxvideo_70_DEFS := \
- IN_MODULE XORG_7X RENDER=1 IN_RT_STATIC
-+ifeq ($(KBUILD_TARGET),freebsd) # don't use .freebsd or anything here.
-+ vboxvideo_70_DEFS += GCCUSESGAS
-+endif
- ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
- vboxvideo_70_DEFS += __EXTENSIONS__ ## @todo Why this?
- endif
View
11 emulators/virtualbox-ose/files/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk
@@ -1,11 +0,0 @@
---- src/VBox/Devices/PC/ipxe/Makefile.kmk.orig 2013-11-29 14:23:32.000000000 -0500
-+++ src/VBox/Devices/PC/ipxe/Makefile.kmk 2013-12-13 15:06:45.000000000 -0500
-@@ -35,7 +35,7 @@
- iPxeBiosBin_CLEAN = \
- $(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c \
-
--if1of ($(KBUILD_TARGET), darwin os2 solaris win)
-+if1of ($(KBUILD_TARGET), darwin freebsd os2 solaris win)
- $$(iPxeBiosBin_0_OUTDIR)/iPxeBiosBin.c: $(PATH_SUB_CURRENT)/iPxeBiosBin.rom $(VBOX_BIN2C) | $$(dir $$@)
- $(call MSG_TOOL,bin2c,iPxeBiosBin,$<,$@)
- $(QUIET)$(VBOX_BIN2C) -min 32 -max 56 -mask 0x1ff -export NetBiosBinary $< $@
View
10 emulators/virtualbox-ose/files/extrapatch-src-recompiler-Makefile.kmk
@@ -1,10 +0,0 @@
---- src/recompiler/Makefile.kmk.orig 2013-11-29 14:25:09.000000000 -0500
-+++ src/recompiler/Makefile.kmk 2013-12-13 14:23:11.000000000 -0500
-@@ -41,6 +41,7 @@
- #
- ifneq ($(KBUILD_TARGET),win)
- VBoxRemPrimary_TEMPLATE = VBOXR3NP
-+ VBoxRemPrimary_TOOL.freebsd = VBoxGccFreeBSD
- # workaround the regparm bug in gcc <= 3.3
- VBoxRemPrimary_DEFS = $(if $(VBOX_GCC_BUGGY_REGPARM),GCC_WITH_BUGGY_REGPARM,)
- else
View
29 emulators/virtualbox-ose/files/patch-src-VBox-Devices-PC-DrvACPI.cpp
@@ -1,29 +0,0 @@
---- src/VBox/Devices/PC/DrvACPI.cpp.orig 2013-11-29 14:23:31.000000000 -0500
-+++ src/VBox/Devices/PC/DrvACPI.cpp 2013-12-13 17:36:50.000000000 -0500
-@@ -204,7 +204,7 @@
- int fAcLine = 0;
- size_t cbParameter = sizeof(fAcLine);
-
-- int rc = sysctlbyname("hw.acpi.acline", &fAcLine, &cbParameter, NULL, NULL);
-+ int rc = sysctlbyname("hw.acpi.acline", &fAcLine, &cbParameter, NULL, 0);
-
- if (!rc)
- {
-@@ -463,7 +463,7 @@
- int fBatteryState = 0;
- size_t cbParameter = sizeof(fBatteryState);
-
-- rc = sysctlbyname("hw.acpi.battery.state", &fBatteryState, &cbParameter, NULL, NULL);
-+ rc = sysctlbyname("hw.acpi.battery.state", &fBatteryState, &cbParameter, NULL, 0);
- if (!rc)
- {
- if ((fBatteryState & ACPI_BATT_STAT_NOT_PRESENT) == ACPI_BATT_STAT_NOT_PRESENT)
-@@ -485,7 +485,7 @@
- /* Get battery level. */
- int curCapacity = 0;
- cbParameter = sizeof(curCapacity);
-- rc = sysctlbyname("hw.acpi.battery.life", &curCapacity, &cbParameter, NULL, NULL);
-+ rc = sysctlbyname("hw.acpi.battery.life", &curCapacity, &cbParameter, NULL, 0);
- if (!rc && curCapacity >= 0)
- *penmRemainingCapacity = (PDMACPIBATCAPACITY)curCapacity;
-
View
11 emulators/virtualbox-ose/files/patch-src-VBox-Devices-Storage-DevAHCI.cpp
@@ -1,11 +0,0 @@
---- src/VBox/Devices/Storage/DevAHCI.cpp.orig 2013-11-29 14:23:47.000000000 -0500
-+++ src/VBox/Devices/Storage/DevAHCI.cpp 2013-12-13 20:05:56.000000000 -0500
-@@ -3242,7 +3242,7 @@
- return 0;
-
- ataH2BE_U16(pbBuf, 0x0); /* feature 0: list of profiles supported */
-- pbBuf[2] = (0 << 2) | (1 << 1) | (1 || 0); /* version 0, persistent, current */
-+ pbBuf[2] = (0 << 2) | (1 << 1) | (1 << 0); /* version 0, persistent, current */
- pbBuf[3] = 8; /* additional bytes for profiles */
- /* The MMC-3 spec says that DVD-ROM read capability should be reported
- * before CD-ROM read capability. */
View
36 emulators/virtualbox-ose/files/patch-src-VBox-Main-src-client-ConsoleImpl2.cpp
@@ -1,36 +0,0 @@
---- src/VBox/Main/src-client/ConsoleImpl2.cpp.orig 2013-09-06 08:30:10.000000000 -0400
-+++ src/VBox/Main/src-client/ConsoleImpl2.cpp 2013-09-12 13:03:34.000000000 -0400
-@@ -4031,12 +4031,13 @@
- }
- }
-
-- Assert((int)maTapFD[uInstance] >= 0);
-- if ((int)maTapFD[uInstance] >= 0)
-+ const int fd = (int)(uintptr_t)maTapFD[uInstance];
-+ Assert(fd >= 0);
-+ if (fd >= 0)
- {
- InsertConfigString(pLunL0, "Driver", "HostInterface");
- InsertConfigNode(pLunL0, "Config", &pCfg);
-- InsertConfigInteger(pCfg, "FileHandle", maTapFD[uInstance]);
-+ InsertConfigInteger(pCfg, "FileHandle", fd);
- }
-
- #elif defined(VBOX_WITH_NETFLT)
-@@ -4230,12 +4231,13 @@
- }
- }
-
-- Assert((int)maTapFD[uInstance] >= 0);
-- if ((int)maTapFD[uInstance] >= 0)
-+ const int fd = (int)(uintptr_t)maTapFD[uInstance];
-+ Assert(fd >= 0);
-+ if (fd >= 0)
- {
- InsertConfigString(pLunL0, "Driver", "HostInterface");
- InsertConfigNode(pLunL0, "Config", &pCfg);
-- InsertConfigInteger(pCfg, "FileHandle", maTapFD[uInstance]);
-+ InsertConfigInteger(pCfg, "FileHandle", fd);
- }
- break;
- }
View
47 emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-MachineImpl.cpp
@@ -1,47 +0,0 @@
---- src/VBox/Main/src-server/MachineImpl.cpp.orig 2013-12-18 11:10:25.000000000 -0500
-+++ src/VBox/Main/src-server/MachineImpl.cpp 2014-02-20 19:17:10.000000000 -0500
-@@ -2374,7 +2374,7 @@
- case 0x8:
- case 0x9:
- case 0xA:
-- AssertCompile(RT_ELEMENTS(mHWData->mCpuIdStdLeafs) == 0xB);
-+ // AssertCompile(RT_ELEMENTS(mHWData->mCpuIdStdLeafs) == 0xB);
- AssertRelease(aId < RT_ELEMENTS(mHWData->mCpuIdStdLeafs));
- setModified(IsModified_MachineData);
- mHWData.backup();
-@@ -2396,7 +2396,7 @@
- case 0x80000008:
- case 0x80000009:
- case 0x8000000A:
-- AssertCompile(RT_ELEMENTS(mHWData->mCpuIdExtLeafs) == 0xB);
-+ // AssertCompile(RT_ELEMENTS(mHWData->mCpuIdExtLeafs) == 0xB);
- AssertRelease(aId - 0x80000000 < RT_ELEMENTS(mHWData->mCpuIdExtLeafs));
- setModified(IsModified_MachineData);
- mHWData.backup();
-@@ -2436,7 +2436,7 @@
- case 0x8:
- case 0x9:
- case 0xA:
-- AssertCompile(RT_ELEMENTS(mHWData->mCpuIdStdLeafs) == 0xB);
-+ // AssertCompile(RT_ELEMENTS(mHWData->mCpuIdStdLeafs) == 0xB);
- AssertRelease(aId < RT_ELEMENTS(mHWData->mCpuIdStdLeafs));
- setModified(IsModified_MachineData);
- mHWData.backup();
-@@ -2455,7 +2455,7 @@
- case 0x80000008:
- case 0x80000009:
- case 0x8000000A:
-- AssertCompile(RT_ELEMENTS(mHWData->mCpuIdExtLeafs) == 0xB);
-+ // AssertCompile(RT_ELEMENTS(mHWData->mCpuIdExtLeafs) == 0xB);
- AssertRelease(aId - 0x80000000 < RT_ELEMENTS(mHWData->mCpuIdExtLeafs));
- setModified(IsModified_MachineData);
- mHWData.backup();
-@@ -9322,7 +9322,7 @@
- mHWData->mVideoCaptureEnabled = data.fVideoCaptureEnabled;
- for (unsigned i = 0; i < RT_ELEMENTS(mHWData->maVideoCaptureScreens); i++)
- mHWData->maVideoCaptureScreens[i] = ASMBitTest(&data.u64VideoCaptureScreens, i);
-- AssertCompile(RT_ELEMENTS(mHWData->maVideoCaptureScreens) == sizeof(data.u64VideoCaptureScreens) * 8);
-+ // AssertCompile(RT_ELEMENTS(mHWData->maVideoCaptureScreens) == sizeof(data.u64VideoCaptureScreens) * 8);
- mHWData->mVideoCaptureRate = data.ulVideoCaptureRate;
- mHWData->mVideoCaptureFPS = data.ulVideoCaptureFPS;
- if (!data.strVideoCaptureFile.isEmpty())
View
11 emulators/virtualbox-ose/files/patch-src-VBox-Main-src-server-VirtualBoxImpl.cpp
@@ -1,11 +0,0 @@
---- src/VBox/Main/src-server/VirtualBoxImpl.cpp.orig 2013-12-18 11:10:25.000000000 -0500
-+++ src/VBox/Main/src-server/VirtualBoxImpl.cpp 2014-02-20 19:51:23.000000000 -0500
-@@ -2355,7 +2355,7 @@
- if (aCiphertextSize < 32)
- return VERR_INVALID_PARAMETER;
-
-- AssertCompile(sizeof(m->SettingsCipherKey) >= 32);
-+ // AssertCompile(sizeof(m->SettingsCipherKey) >= 32);
-
- /* store the first 8 bytes of the cipherkey for verification */
- for (i = 0, j = 0; i < 8; i++, j++)
View
14 emulators/virtualbox-ose/files/patch-src-VBox-Runtime-common-misc-uri.cpp
@@ -1,14 +0,0 @@
---- src/VBox/Runtime/common/misc/uri.cpp.orig 2013-12-18 11:10:34.000000000 -0500
-+++ src/VBox/Runtime/common/misc/uri.cpp 2013-12-19 20:57:32.000000000 -0500
-@@ -132,7 +132,10 @@
- /* % encoding means the percent sign and exactly 2 hexadecimal
- * digits describing the ASCII number of the character. */
- ++iIn;
-- char szNum[] = { pszString[iIn++], pszString[iIn++], '\0' };
-+ char szNum[3];
-+ szNum[0] = pszString[iIn++];
-+ szNum[1] = pszString[iIn++];
-+ szNum[2] = '\0';
- uint8_t u8;
- rc = RTStrToUInt8Ex(szNum, NULL, 16, &u8);
- if (RT_FAILURE(rc))
View
11 emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-freebsd-fileaio-freebsd.cpp
@@ -1,11 +0,0 @@
---- src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp.orig 2013-11-29 14:24:23.000000000 -0500
-+++ src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp 2013-12-13 17:32:50.000000000 -0500
-@@ -124,7 +124,7 @@
- &cReqsOutstandingMax, /* Where to store the old value. */
- &cbParameter, /* Size of the memory pointed to. */
- NULL, /* Where the new value is located. */
-- NULL); /* Where the size of the new value is stored. */
-+ 0); /* Where the size of the new value is stored. */
- if (rcBSD == -1)
- {
- /* ENOENT means the value is unknown thus the module is not loaded. */
View
29 emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r3-freebsd-mp-freebsd.cpp
@@ -1,29 +0,0 @@
---- src/VBox/Runtime/r3/freebsd/mp-freebsd.cpp.orig 2013-11-29 14:24:23.000000000 -0500
-+++ src/VBox/Runtime/r3/freebsd/mp-freebsd.cpp 2013-12-13 16:25:44.000000000 -0500
-@@ -93,7 +93,7 @@
- char szDriver[10];
- size_t cbDriver = sizeof(szDriver);
- RT_ZERO(szDriver); /* this shouldn't be necessary. */
-- int rcBsd = sysctlbyname(szName, szDriver, &cbDriver, NULL, NULL);
-+ int rcBsd = sysctlbyname(szName, szDriver, &cbDriver, NULL, 0);
- if (rcBsd == 0)
- return true;
-
-@@ -154,7 +154,7 @@
- return 0;
-
- /* CPU's have a common frequency. */
-- int rc = sysctlbyname("dev.cpu.0.freq", &uFreqCurr, &cbParameter, NULL, NULL);
-+ int rc = sysctlbyname("dev.cpu.0.freq", &uFreqCurr, &cbParameter, NULL, 0);
- if (rc)
- return 0;
-
-@@ -176,7 +176,7 @@
- * CPU 0 has the freq levels entry. ENOMEM is ok as we don't need all supported
- * levels but only the first one.
- */
-- int rc = sysctlbyname("dev.cpu.0.freq_levels", szFreqLevels, &cbFreqLevels, NULL, NULL);
-+ int rc = sysctlbyname("dev.cpu.0.freq_levels", szFreqLevels, &cbFreqLevels, NULL, 0);
- if ( (rc && (errno != ENOMEM))
- || (cbFreqLevels == 0))
- return 0;
View
11 sysutils/grub2-efi/Makefile
@@ -1,11 +1,11 @@
# Created by: kmoore@FreeBSD.org
-# $FreeBSD$
+# $FreeBSD: head/sysutils/grub2-efi/Makefile 331644 2013-10-26 00:52:33Z gerald $
PORTNAME= grub2-efi
-PORTVERSION= 2.00
-PORTREVISION= 2
+PORTVERSION= 2.02
CATEGORIES= sysutils
-MASTER_SITES= GNU/grub
+MASTER_SITES= http://www.pcbsd.org/~kris/software/ \
+ ftp://ftp.pcbsd.org/pub/software/
DISTNAME= grub-${PORTVERSION}
MAINTAINER= kmoore@FreeBSD.org
@@ -39,6 +39,9 @@ post-patch:
@${LN} -s ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf ${WRKSRC}
@${TOUCH} -t 200001010000 ${WRKSRC}/Makefile.util.def
+pre-configure:
+ cd ${WRKSRC} && ./autogen.sh
+
post-configure:
@${LN} -sfh /usr/include/machine /usr/include/sys /usr/include/x86 ${WRKSRC}/grub-core
View
4 sysutils/grub2-efi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (grub-2.00.tar.xz) = 784ec38e7edc32239ad75b8e66df04dc8bfb26d88681bc9f627133a6eb85c458
-SIZE (grub-2.00.tar.xz) = 5136412
+SHA256 (grub-2.02.tar.xz) = af5eae25f0a7388d597aeba5f7c8f303b41091845ee502ceaf8784200a3fb344
+SIZE (grub-2.02.tar.xz) = 4463732
View
254 sysutils/grub2-efi/files/patch-Makefile.util.am
@@ -1,254 +0,0 @@
---- 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_stream.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 grub-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_stream.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 grub-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_stream.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 grub-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_stream.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 grub-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_stream.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 grub-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_stream.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 grub-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_stream.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 grub-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_stream.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 grub-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_stream.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 grub-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_stream.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 grub-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_stream.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 grub-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_stream.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 grub-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_stream.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 grub-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_stream.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 grub-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)
View
11 sysutils/grub2-efi/files/patch-Makefile.util.def
@@ -1,11 +0,0 @@
---- 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;
- };
-
View
130 sysutils/grub2-efi/files/patch-build-aux_test-driver
@@ -1,130 +0,0 @@
---- 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@gnu.org> or send patches to
-+# <automake-patches@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='' # Red.
-+ grn='' # Green.
-+ lgn='' # Light green.
-+ blu='' # Blue.
-+ mgn='' # Magenta.
-+ std='' # 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:
View
35 sysutils/grub2-efi/files/patch-configure.ac
@@ -1,35 +0,0 @@
---- 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
View
893 sysutils/grub2-efi/files/patch-grub-2.00-zfs-feature-flag-support
@@ -1,893 +0,0 @@
-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",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,317 @@
-+/*
-+ * 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 <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
View
128 sysutils/grub2-efi/files/patch-grub-core-Makefile.core.am
@@ -1,128 +0,0 @@
---- 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)
View
18 sysutils/grub2-efi/files/patch-grub-core-gnulib-Makefile.am
@@ -1,18 +0,0 @@
---- 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 ;; \
View
14 sysutils/grub2-efi/files/patch-grub-core-gnulib-argp-fmtstream.c
@@ -1,14 +0,0 @@
---- 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
View
49 sysutils/grub2-efi/files/patch-grub-core-loader-i386-bsd.c
@@ -1,49 +0,0 @@
-=== 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)
-
View
11 sysutils/grub2-efi/files/patch-grub-core_lib_libgcrypt-grub_src_types.h
@@ -0,0 +1,11 @@
+--- grub-core/lib/libgcrypt/src/types.h.o 2014-03-03 17:14:46.722210112 -0500
++++ grub-core/lib/libgcrypt/src/types.h 2014-03-03 17:05:54.572824164 -0500
+@@ -113,6 +113,8 @@
+ #endif
+ #endif
+
++typedef uint64_t u64;
++
+ typedef union {
+ int a;
+ short b;
View
12 sysutils/grub2-efi/files/patch-include-grub-util-libzfs.h
@@ -1,12 +0,0 @@
---- 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 */
-
View
92 sysutils/grub2-efi/pkg-plist
@@ -415,5 +415,97 @@ lib/grub/x86_64-efi/gzio.mod
lib/grub/x86_64-efi/cmp.mod
lib/grub/x86_64-efi/read.module
lib/grub/x86_64-efi/ufs1.mod
+lib/grub/x86_64-efi/archelp.mod
+lib/grub/x86_64-efi/archelp.module
+lib/grub/x86_64-efi/cbfs.mod
+lib/grub/x86_64-efi/cbfs.module
+lib/grub/x86_64-efi/cbls.mod
+lib/grub/x86_64-efi/cbls.module
+lib/grub/x86_64-efi/cbmemc.mod
+lib/grub/x86_64-efi/cbmemc.module
+lib/grub/x86_64-efi/cbtable.mod
+lib/grub/x86_64-efi/cbtable.module
+lib/grub/x86_64-efi/cbtime.mod
+lib/grub/x86_64-efi/cbtime.module
+lib/grub/x86_64-efi/cmdline_cat_test.mod
+lib/grub/x86_64-efi/cmdline_cat_test.module
+lib/grub/x86_64-efi/disk.mod
+lib/grub/x86_64-efi/disk.module
+lib/grub/x86_64-efi/div_test.mod
+lib/grub/x86_64-efi/div_test.module
+lib/grub/x86_64-efi/efifwsetup.mod
+lib/grub/x86_64-efi/efifwsetup.module
+lib/grub/x86_64-efi/eval.mod
+lib/grub/x86_64-efi/eval.module
+lib/grub/x86_64-efi/file.mod
+lib/grub/x86_64-efi/file.module
+lib/grub/x86_64-efi/gcry_dsa.mod
+lib/grub/x86_64-efi/gcry_dsa.module
+lib/grub/x86_64-efi/gcry_idea.mod
+lib/grub/x86_64-efi/gcry_idea.module
+lib/grub/x86_64-efi/gcry_rsa.mod
+lib/grub/x86_64-efi/gcry_rsa.module
+lib/grub/x86_64-efi/gfxterm_background.mod
+lib/grub/x86_64-efi/gfxterm_background.module
+lib/grub/x86_64-efi/gfxterm_menu.mod
+lib/grub/x86_64-efi/gfxterm_menu.module
+lib/grub/x86_64-efi/hfspluscomp.mod
+lib/grub/x86_64-efi/hfspluscomp.module
+lib/grub/x86_64-efi/legacy_password_test.mod
+lib/grub/x86_64-efi/legacy_password_test.module
+lib/grub/x86_64-efi/legacycfg.mod
+lib/grub/x86_64-efi/legacycfg.module
+lib/grub/x86_64-efi/linux16.mod
+lib/grub/x86_64-efi/linux16.module
+lib/grub/x86_64-efi/lsefi.mod
+lib/grub/x86_64-efi/lsefi.module
+lib/grub/x86_64-efi/macbless.mod
+lib/grub/x86_64-efi/macbless.module
+lib/grub/x86_64-efi/macho.mod
+lib/grub/x86_64-efi/macho.module
+lib/grub/x86_64-efi/morse.mod
+lib/grub/x86_64-efi/morse.module
+lib/grub/x86_64-efi/mpi.mod
+lib/grub/x86_64-efi/mpi.module
+lib/grub/x86_64-efi/nativedisk.mod
+lib/grub/x86_64-efi/nativedisk.module
+lib/grub/x86_64-efi/offsetio.mod
+lib/grub/x86_64-efi/offsetio.module
+lib/grub/x86_64-efi/part_dfly.mod
+lib/grub/x86_64-efi/part_dfly.module
+lib/grub/x86_64-efi/pbkdf2_test.mod
+lib/grub/x86_64-efi/pbkdf2_test.module
+lib/grub/x86_64-efi/pcidump.mod
+lib/grub/x86_64-efi/pcidump.module
+lib/grub/x86_64-efi/procfs.mod
+lib/grub/x86_64-efi/procfs.module
+lib/grub/x86_64-efi/progress.mod
+lib/grub/x86_64-efi/progress.module
+lib/grub/x86_64-efi/setjmp_test.mod
+lib/grub/x86_64-efi/setjmp_test.module
+lib/grub/x86_64-efi/signature_test.mod
+lib/grub/x86_64-efi/signature_test.module
+lib/grub/x86_64-efi/sleep_test.mod
+lib/grub/x86_64-efi/sleep_test.module
+lib/grub/x86_64-efi/spkmodem.mod
+lib/grub/x86_64-efi/spkmodem.module
+lib/grub/x86_64-efi/syslinuxcfg.mod
+lib/grub/x86_64-efi/syslinuxcfg.module
+lib/grub/x86_64-efi/testspeed.mod
+lib/grub/x86_64-efi/testspeed.module
+lib/grub/x86_64-efi/tr.mod
+lib/grub/x86_64-efi/tr.module
+lib/grub/x86_64-efi/ufs1_be.mod
+lib/grub/x86_64-efi/ufs1_be.module
+lib/grub/x86_64-efi/usbserial_usbdebug.mod
+lib/grub/x86_64-efi/usbserial_usbdebug.module
+lib/grub/x86_64-efi/verify.mod
+lib/grub/x86_64-efi/verify.module
+lib/grub/x86_64-efi/video_colors.mod
+lib/grub/x86_64-efi/video_colors.module
+lib/grub/x86_64-efi/videotest_checksum.mod
+lib/grub/x86_64-efi/videotest_checksum.module
+lib/grub/x86_64-efi/xnu_uuid_test.mod
+lib/grub/x86_64-efi/xnu_uuid_test.module
@dirrm lib/grub/x86_64-efi
@dirrmtry lib/grub
Please sign in to comment.
Something went wrong with that request. Please try again.