author: Kris Moore <kmoore@FreeBSD.org> 2015-06-07 22:34:49 +0000
committer: Kris Moore <kmoore@FreeBSD.org> 2015-06-07 22:34:49 +0000
commit: 7d456e01cfa7b6548a5a6415b8bc0bfa866bbaf0 (patch)
tree: 86b260e4f3f385d32b22d0f57b5180bbf0308b8c /sysutils/grub2-efi
parent: 12f393e711b323e3dc82be03649310c35e1705e8 (diff)
download: ports-7d456e01cfa7b6548a5a6415b8bc0bfa866bbaf0.tar.gz
ports-7d456e01cfa7b6548a5a6415b8bc0bfa866bbaf0.zip
14 files changed, 683 insertions, 824 deletions
diff --git a/sysutils/grub2-efi/Makefile b/sysutils/grub2-efi/Makefile
index d1ede0f2ec62..7d19b55f46fc 100644
--- a/sysutils/grub2-efi/Makefile
+++ b/sysutils/grub2-efi/Makefile
@@ -3,12 +3,11 @@
 
 PORTNAME=	grub2-efi
 PORTVERSION=	2.02
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.pcbsd.org/~kris/software/ \
 		ftp://ftp.pcbsd.org/pub/software/
-DISTNAME=	grub-${PORTVERSION}_4
-WRKSRC=		${WRKDIR}/grub-${PORTVERSION}
+DISTNAME=	grub-${PORTVERSION}_7
 
 MAINTAINER=	kmoore@FreeBSD.org
 COMMENT=	Multiboot EFI boot loader
@@ -21,12 +20,12 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
 		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
 		help2man:${PORTSDIR}/misc/help2man
 
+WRKSRC=		${WRKDIR}/grub-${PORTVERSION}
 SSP_UNSAFE=	yes
 USE_GCC=	yes
-USE_AUTOTOOLS=	automake aclocal autoconf
 ACLOCAL_ARGS=	-Im4
 GNU_CONFIGURE=	yes
-USES=		bison cpe gettext gmake python tar:xz
+USES=		autoreconf bison cpe gettext gmake python tar:xz
 ONLY_FOR_ARCHS=	amd64
 MAKE_JOBS_UNSAFE=	yes
 
@@ -51,8 +50,8 @@ post-configure:
 	@${LN} -sfh /usr/include/machine /usr/include/sys /usr/include/x86 ${WRKSRC}/grub-core
 
 do-install:
-	@cd ${WRKSRC}/grub-core && gmake install DESTDIR=${STAGEDIR}
-
-.include <bsd.port.post.mk>
+	@cd ${WRKSRC}/grub-core && ${GMAKE} install DESTDIR=${STAGEDIR}
 
 RUN_DEPENDS:=	${RUN_DEPENDS:Ngcc*}
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/grub2-efi/distinfo b/sysutils/grub2-efi/distinfo
index 992bc971ef64..718a5b0d1c35 100644
--- a/sysutils/grub2-efi/distinfo
+++ b/sysutils/grub2-efi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (grub-2.02_4.tar.xz) = a83d1d5cbde835183252f640899bbe6700b7517f49d844756e0ec81d32a27309
-SIZE (grub-2.02_4.tar.xz) = 4471692
+SHA256 (grub-2.02_7.tar.xz) = 044588d9754142f2982478cb4e7289ab1521fd4412b2a0804ce647c3ff73feff
+SIZE (grub-2.02_7.tar.xz) = 5019120
diff --git a/sysutils/grub2-efi/files/patch-grub-core_disk_efi_efidisk.c b/sysutils/grub2-efi/files/patch-grub-core_disk_efi_efidisk.c
deleted file mode 100644
index f364c07c3131..000000000000
--- a/sysutils/grub2-efi/files/patch-grub-core_disk_efi_efidisk.c
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c
-index 3b12c34..97f7456 100644
---- grub-core/disk/efi/efidisk.c
-+++ grub-core/disk/efi/efidisk.c
-@@ -862,9 +862,7 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
- 	  if (! ctx.partition_name)
- 	    {
- 	      grub_disk_close (parent);
--	      if (is_cdrom)
--		return grub_strdup (device_name);
--	      return 0;
-+              return grub_strdup (device_name);
- 	    }
- 
- 	  dev_name = grub_xasprintf ("%s,%s", parent->name,
diff --git a/sysutils/grub2-efi/files/patch-grub-core_disk_geli.c b/sysutils/grub2-efi/files/patch-grub-core_disk_geli.c
deleted file mode 100644
index 276b7f039a90..000000000000
--- a/sysutils/grub2-efi/files/patch-grub-core_disk_geli.c
+++ /dev/null
@@ -1,76 +0,0 @@
---- grub-core/disk/geli.c.orig	2014-12-30 11:08:32.000000000 -0500
-+++ grub-core/disk/geli.c	2015-01-13 13:42:46.758595608 -0500
-@@ -225,7 +225,7 @@
- 
-   /* Look for GELI magic sequence.  */
-   if (grub_memcmp (header->magic, GELI_MAGIC, sizeof (GELI_MAGIC))
--      || grub_le_to_cpu32 (header->version) > 5
-+      || grub_le_to_cpu32 (header->version) > 7
-       || grub_le_to_cpu32 (header->version) < 1)
-     grub_util_error ("%s", _("wrong ELI magic or version"));
- 
-@@ -265,7 +265,7 @@
- 
-   /* Look for GELI magic sequence.  */
-   if (grub_memcmp (header.magic, GELI_MAGIC, sizeof (GELI_MAGIC))
--      || grub_le_to_cpu32 (header.version) > 5
-+      || grub_le_to_cpu32 (header.version) > 7
-       || grub_le_to_cpu32 (header.version) < 1)
-     {
-       grub_dprintf ("geli", "wrong magic %02x\n", header.magic[0]);
-@@ -401,6 +401,7 @@
-   grub_uint8_t geomkey[GRUB_CRYPTO_MAX_MDLEN];
-   grub_uint8_t verify_key[GRUB_CRYPTO_MAX_MDLEN];
-   grub_uint8_t zero[GRUB_CRYPTO_MAX_CIPHER_BLOCKSIZE];
-+  grub_uint8_t geli_cipher_key[64];
-   char passphrase[MAX_PASSPHRASE] = "";
-   unsigned i;
-   gcry_err_code_t gcry_err;
-@@ -440,6 +441,9 @@
-   if (!grub_password_get (passphrase, MAX_PASSPHRASE))
-     return grub_error (GRUB_ERR_BAD_ARGUMENT, "Passphrase not supplied");
- 
-+  /* Set the GELI passphrase to GRUB env, for passing to FreeBSD kernel */
-+  grub_env_set ("gelipassphrase", passphrase);
-+
-   /* Calculate the PBKDF2 of the user supplied passphrase.  */
-   if (grub_le_to_cpu32 (header.niter) != 0)
-     {
-@@ -524,6 +528,19 @@
- 	continue;
-       grub_printf_ (N_("Slot %d opened\n"), i);
- 
-+      if (grub_le_to_cpu32 (header.version) >= 7)
-+        {
-+          /* GELI >=7 uses the cipher_key */
-+	  grub_memcpy (geli_cipher_key, candidate_key.cipher_key,
-+		sizeof (candidate_key.cipher_key));
-+        }
-+      else
-+        {
-+          /* GELI <=6 uses the iv_key */
-+	  grub_memcpy (geli_cipher_key, candidate_key.iv_key,
-+		sizeof (candidate_key.iv_key));
-+        }
-+
-       /* Set the master key.  */
-       if (!dev->rekey)
- 	{
-@@ -540,13 +557,13 @@
- 	  grub_size_t real_keysize = keysize;
- 	  if (grub_le_to_cpu16 (header.alg) == 0x16)
- 	    real_keysize *= 2;
--	  /* For a reason I don't know, the IV key is used in rekeying.  */
--	  grub_memcpy (dev->rekey_key, candidate_key.iv_key,
--		       sizeof (candidate_key.iv_key));
-+
-+	  grub_memcpy (dev->rekey_key, geli_cipher_key,
-+		       sizeof (geli_cipher_key));
- 	  dev->rekey_derived_size = real_keysize;
- 	  dev->last_rekey = -1;
- 	  COMPILE_TIME_ASSERT (sizeof (dev->rekey_key)
--			       >= sizeof (candidate_key.iv_key));
-+		       >= sizeof (geli_cipher_key));
- 	}
- 
-       dev->iv_prefix_len = sizeof (candidate_key.iv_key);
diff --git a/sysutils/grub2-efi/files/patch-grub-core_fs_zfs_zfs.c b/sysutils/grub2-efi/files/patch-grub-core_fs_zfs_zfs.c
deleted file mode 100644
index c514f9fb2349..000000000000
--- a/sysutils/grub2-efi/files/patch-grub-core_fs_zfs_zfs.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- grub-core/fs/zfs/zfs.c.orig	2014-08-06 10:04:26.129840841 -0400
-+++ grub-core/fs/zfs/zfs.c	2014-08-06 10:05:01.587771419 -0400
-@@ -281,7 +281,7 @@
-  */
- #define MAX_SUPPORTED_FEATURE_STRLEN 50
- static const char *spa_feature_names[] = {
--  "org.illumos:lz4_compress",NULL
-+  "org.illumos:lz4_compress","com.delphix:hole_birth",NULL
- };
- 
- static int
diff --git a/sysutils/grub2-efi/files/patch-grub-core_lib_libgcrypt-grub_src_types.h b/sysutils/grub2-efi/files/patch-grub-core_lib_libgcrypt-grub_src_types.h
deleted file mode 100644
index a4542b360627..000000000000
--- a/sysutils/grub2-efi/files/patch-grub-core_lib_libgcrypt-grub_src_types.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
diff --git a/sysutils/grub2-efi/files/patch-grub-core_loader_i386_bsd.c b/sysutils/grub2-efi/files/patch-grub-core_loader_i386_bsd.c
index 2f1db76fb002..a69efa6d22b2 100644
--- a/sysutils/grub2-efi/files/patch-grub-core_loader_i386_bsd.c
+++ b/sysutils/grub2-efi/files/patch-grub-core_loader_i386_bsd.c
@@ -1,20 +1,185 @@
-diff --git grub-core/loader/i386/bsd.c grub-core/loader/i386/bsd.c
-index 8f691e0..8c7decd 100644
---- grub-core/loader/i386/bsd.c
+--- grub-core/loader/i386/bsd.c.orig	2015-01-30 16:34:55 UTC
 +++ grub-core/loader/i386/bsd.c
-@@ -415,11 +415,14 @@ grub_freebsd_add_meta_module (const char *filename, const char *type,
- 			      grub_addr_t addr, grub_uint32_t size)
+@@ -42,12 +42,14 @@
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
+ #include <grub/video.h>
++#include <grub/acpi.h>
+ #ifdef GRUB_MACHINE_PCBIOS
+ #include <grub/machine/biosnum.h>
+ #endif
+ #ifdef GRUB_MACHINE_EFI
+ #include <grub/efi/efi.h>
+ #define NETBSD_DEFAULT_VIDEO_MODE "800x600"
++#define FREEBSD_DEFAULT_VIDEO_MODE "auto"
+ #else
+ #define NETBSD_DEFAULT_VIDEO_MODE "text"
+ #include <grub/i386/pc/vbe.h>
+@@ -585,6 +587,72 @@ freebsd_get_zfs (void)
+   grub_free (uuid);
+ }
+ 
++#ifdef GRUB_MACHINE_EFI
++
++static grub_err_t
++grub_freebsd_setup_video (void)
++{
++  struct grub_video_mode_info mode_info;
++  void *framebuffer;
++  const char *modevar;
++  struct grub_freebsd_btinfo_framebuf efifb;
++  grub_err_t err;
++  grub_video_driver_id_t driv_id;
++
++  modevar = grub_env_get ("gfxpayload");
++
++  /* Now all graphical modes are acceptable.
++     May change in future if we have modes without framebuffer.  */
++  if (modevar && *modevar != 0)
++    {
++      char *tmp;
++      tmp = grub_xasprintf ("%s;" FREEBSD_DEFAULT_VIDEO_MODE, modevar);
++      if (! tmp)
++	return grub_errno;
++      err = grub_video_set_mode (tmp, 0, 0);
++      grub_free (tmp);
++    }
++  else
++    err = grub_video_set_mode (FREEBSD_DEFAULT_VIDEO_MODE, 0, 0);
++
++  if (err)
++    return err;
++
++  driv_id = grub_video_get_driver_id ();
++  if (driv_id == GRUB_VIDEO_DRIVER_NONE)
++    return GRUB_ERR_NONE;
++
++  err = grub_video_get_info_and_fini (&mode_info, &framebuffer);
++
++  if (err)
++    return err;
++
++  efifb.fb_width = mode_info.width;
++  efifb.fb_height = mode_info.height;
++  efifb.fb_stride = mode_info.pitch / mode_info.bytes_per_pixel;
++
++  efifb.fb_addr = (grub_addr_t) framebuffer;
++  efifb.fb_size = ALIGN_UP (mode_info.pitch * efifb.fb_height, 65536);
++
++  if ( mode_info.blue_field_pos == 16 ) {
++    efifb.fb_mask_red = 0x000000ff;
++    efifb.fb_mask_green = 0x0000ff00;
++    efifb.fb_mask_blue = 0x00ff0000;
++  }
++
++  if ( mode_info.blue_field_pos == 0 ) {
++    efifb.fb_mask_red = 0x00ff0000;
++    efifb.fb_mask_green = 0x0000ff00;
++    efifb.fb_mask_blue = 0x000000ff;
++  }
++
++  efifb.fb_mask_reserved = 0xff000000;
++
++  err = grub_bsd_add_meta ( FREEBSD_MODINFO_METADATA | FREEBSD_BTINFO_FRAMEBUF, &efifb, sizeof (efifb));
++  return err;
++}
++#endif
++
+ static grub_err_t
+ grub_freebsd_boot (void)
  {
-   const char *name;
--  name = grub_strrchr (filename, '/');
-+ /* Don't strip the full path, some FreeBSD functionality, such
-+  * as dtrace, rely on this. Instead only strip out the portion after ZFS @ sign */
-+  name = grub_strrchr (filename, '@');
-   if (name)
-     name++;
-   else
-     name = filename;
-+
-   if (grub_strcmp (type, "/boot/zfs/zpool.cache") == 0)
-     name = "/boot/zfs/zpool.cache";
+@@ -603,6 +671,55 @@ grub_freebsd_boot (void)
  
+   bi.boot_device = freebsd_biosdev;
+ 
++#ifdef GRUB_MACHINE_EFI
++  /* When booting in EFI mode, we need to export some additional kernel ACPI hints */
++  struct grub_acpi_rsdp_v10 *v1;
++  struct grub_acpi_rsdp_v20 *v2;
++  v1 = grub_acpi_get_rsdpv1 ();
++  v2 = grub_acpi_get_rsdpv2 ();
++  if (v2 && v2->length > 40)
++    v2 = 0;
++
++  int revision;
++  char acpiBuf[24];
++
++  if (v1)
++  {
++     revision = v1->revision;
++     if ( revision == 0 )
++        revision = 1;
++     grub_snprintf (acpiBuf, sizeof (acpiBuf), "%d", revision);
++     grub_env_set("kFreeBSD.hint.acpi.0.revision", acpiBuf);
++
++     grub_snprintf (acpiBuf, sizeof (acpiBuf), "%s", v1->oemid);
++     grub_env_set("kFreeBSD.hint.acpi.0.oem", acpiBuf);
++
++     grub_snprintf (acpiBuf, sizeof (acpiBuf), "0x%016x", v1->rsdt_addr);
++     grub_env_set("kFreeBSD.hint.acpi.0.rsdt", acpiBuf);
++
++     grub_snprintf (acpiBuf, sizeof (acpiBuf), "0x%016llx", (unsigned long long)v1);
++     grub_env_set("kFreeBSD.hint.acpi.0.rsdp", acpiBuf);
++  }
++
++  if (v2)
++  {
++     revision = v2->rsdpv1.revision;
++     if ( revision == 0 )
++        revision = 1;
++
++     grub_snprintf (acpiBuf, sizeof (acpiBuf), "%d", revision);
++     grub_env_set("kFreeBSD.hint.acpi.0.revision", acpiBuf);
++
++     grub_snprintf (acpiBuf, sizeof (acpiBuf), "0x%016llx", (unsigned long long)v2->xsdt_addr);
++     grub_env_set("kFreeBSD.hint.acpi.0.xsdt", acpiBuf);
++
++     grub_snprintf (acpiBuf, sizeof (acpiBuf), "%d", v2->length);
++     grub_env_set("kFreeBSD.hint.acpi.0.xsdt_length", acpiBuf);
++  }
++
++
++#endif
++
+   p_size = 0;
+   FOR_SORTED_ENV (var)
+     if ((grub_memcmp (var->name, "kFreeBSD.", sizeof("kFreeBSD.") - 1) == 0) && (var->name[sizeof("kFreeBSD.") - 1]))
+@@ -688,6 +805,10 @@ grub_freebsd_boot (void)
+ 		*(grub_uint32_t *) p_tag = bootflags;
+ 	      break;
+ 
++	    case FREEBSD_MODINFO_METADATA | FREEBSD_BTINFO_FRAMEBUF:
++	      grub_memcpy (p_tag, tag->data, tag->len);
++	      break;
++
+ 	    case FREEBSD_MODINFO_METADATA | FREEBSD_MODINFOMD_ENVP:
+ 	      if (is_64bit)
+ 		*(grub_uint64_t *) p_tag = bi.environment;
+@@ -717,7 +838,10 @@ grub_freebsd_boot (void)
+ 
+   bi.kern_end = kern_end;
+ 
++#ifndef GRUB_MACHINE_EFI
++  /* Don't set text mode on EFI boot */
+   grub_video_set_mode ("text", 0, 0);
++#endif
+ 
+   if (is_64bit)
+     {
+@@ -1561,6 +1685,16 @@ grub_cmd_freebsd (grub_extcmd_context_t 
+ 				   FREEBSD_MODINFOMD_KERNEND, &data, len);
+ 	  if (err)
+ 	    return err;
++
++#ifdef GRUB_MACHINE_EFI
++	  err = grub_freebsd_setup_video ();
++	  if (err)
++	  {
++	    grub_print_error ();
++	    grub_puts_ (N_("Booting in EFI blind mode"));
++	    grub_errno = GRUB_ERR_NONE;
++	  }
++#endif
+ 	}
+       grub_bsd_get_device (&freebsd_biosdev, &unit, &slice, &part);
+       freebsd_zfsguid = 0;
diff --git a/sysutils/grub2-efi/files/patch-grub-core_partmap_gpt.c b/sysutils/grub2-efi/files/patch-grub-core_partmap_gpt.c
index a249ef819861..5ed32e5fd0ae 100644
--- a/sysutils/grub2-efi/files/patch-grub-core_partmap_gpt.c
+++ b/sysutils/grub2-efi/files/patch-grub-core_partmap_gpt.c
@@ -1,6 +1,6 @@
---- grub-core/partmap/gpt.c.orig	2014-12-02 14:37:43.000000000 +0800
-+++ grub-core/partmap/gpt.c	2014-12-02 14:37:49.000000000 +0800
-@@ -37,6 +37,7 @@
+--- grub-core/partmap/gpt.c.orig	2014-10-20 16:16:07 UTC
++++ grub-core/partmap/gpt.c
+@@ -37,6 +37,7 @@ static const grub_gpt_part_type_t grub_g
  
  #ifdef GRUB_UTIL
  static const grub_gpt_part_type_t grub_gpt_partition_type_bios_boot = GRUB_GPT_PARTITION_TYPE_BIOS_BOOT;
@@ -8,7 +8,7 @@
  #endif
  
  /* 512 << 7 = 65536 byte sectors.  */
-@@ -155,7 +156,8 @@
+@@ -155,7 +156,8 @@ find_usable_region (grub_disk_t disk __a
    disk->partition = p2;
  
    /* If there's an embed region, it is in a dedicated partition.  */
diff --git a/sysutils/grub2-efi/files/patch-grub-efi-framebuffer b/sysutils/grub2-efi/files/patch-grub-efi-framebuffer
deleted file mode 100644
index 147747b3fbcd..000000000000
--- a/sysutils/grub2-efi/files/patch-grub-efi-framebuffer
+++ /dev/null
@@ -1,272 +0,0 @@
-From 997363ec7698f34d74769960c4e76cf8b369052e Mon Sep 17 00:00:00 2001
-From: Kris Moore <kris@pcbsd.org>
-Date: Tue, 30 Dec 2014 14:34:58 -0500
-Subject: [PATCH] Add the patch for FreeBSD UEFI booting / framebuffer
- passthrough, add fixes to ACPI environment variables while here
-
----
- ChangeLog                            |   9 +++
- grub-core/loader/i386/bsd.c          | 134 +++++++++++++++++++++++++++++++++++
- include/grub/i386/bsd.h              |   1 +
- include/grub/i386/freebsd_bootinfo.h |  33 +++++++++
- 4 files changed, 177 insertions(+)
- create mode 100644 include/grub/i386/freebsd_bootinfo.h
-
-diff --git ChangeLog ChangeLog
-index c38917b..b717a2d 100644
---- ChangeLog
-+++ ChangeLog
-@@ -1,3 +1,12 @@
-+2014-12-30  Kris Moore  <kris@pcbsd.org>
-+	* grub-core/loader/i386/bsd.c: Set FreeBSD specific ACPI hints when booting
-+	in EFI mode
-+	* grub-core/loader/i386/bsd.c: Add default FreeBSD EFI video mode, and
-+	structure to pass information into EFI booted kernel
-+	* include/grub/i386/bsd.h: Include new freebsd_bootinfo.h
-+	* include/grub/i386/freebsd_bootinfo.h: Add grub_freebsd_btinfo_framebuf
-+	structure for FreeBSD EFI framebuffer passthrough
-+
- 2014-12-09  Andrei Borzenkov  <arvidjaar@gmail.com>
- 
- 	* grub-core/term/serial.c (grub_cmd_serial): Fix --rtscts
-diff --git grub-core/loader/i386/bsd.c grub-core/loader/i386/bsd.c
-index 8f691e0..9d51cff 100644
---- grub-core/loader/i386/bsd.c
-+++ grub-core/loader/i386/bsd.c
-@@ -42,12 +42,14 @@
- GRUB_MOD_LICENSE ("GPLv3+");
- 
- #include <grub/video.h>
-+#include <grub/acpi.h>
- #ifdef GRUB_MACHINE_PCBIOS
- #include <grub/machine/biosnum.h>
- #endif
- #ifdef GRUB_MACHINE_EFI
- #include <grub/efi/efi.h>
- #define NETBSD_DEFAULT_VIDEO_MODE "800x600"
-+#define FREEBSD_DEFAULT_VIDEO_MODE "800x600"
- #else
- #define NETBSD_DEFAULT_VIDEO_MODE "text"
- #include <grub/i386/pc/vbe.h>
-@@ -584,6 +586,72 @@ freebsd_get_zfs (void)
-   grub_free (uuid);
- }
- 
-+#ifdef GRUB_MACHINE_EFI
-+
-+static grub_err_t
-+grub_freebsd_setup_video (void)
-+{
-+  struct grub_video_mode_info mode_info;
-+  void *framebuffer;
-+  const char *modevar;
-+  struct grub_freebsd_btinfo_framebuf efifb;
-+  grub_err_t err;
-+  grub_video_driver_id_t driv_id;
-+
-+  modevar = grub_env_get ("gfxpayload");
-+
-+  /* Now all graphical modes are acceptable.
-+     May change in future if we have modes without framebuffer.  */
-+  if (modevar && *modevar != 0)
-+    {
-+      char *tmp;
-+      tmp = grub_xasprintf ("%s;" FREEBSD_DEFAULT_VIDEO_MODE, modevar);
-+      if (! tmp)
-+	return grub_errno;
-+      err = grub_video_set_mode (tmp, 0, 0);
-+      grub_free (tmp);
-+    }
-+  else
-+    err = grub_video_set_mode (FREEBSD_DEFAULT_VIDEO_MODE, 0, 0);
-+
-+  if (err)
-+    return err;
-+
-+  driv_id = grub_video_get_driver_id ();
-+  if (driv_id == GRUB_VIDEO_DRIVER_NONE)
-+    return GRUB_ERR_NONE;
-+
-+  err = grub_video_get_info_and_fini (&mode_info, &framebuffer);
-+
-+  if (err)
-+    return err;
-+
-+  efifb.fb_width = mode_info.width;
-+  efifb.fb_height = mode_info.height;
-+  efifb.fb_stride = mode_info.pitch / mode_info.bytes_per_pixel;
-+
-+  efifb.fb_addr = (grub_addr_t) framebuffer;
-+  efifb.fb_size = ALIGN_UP (mode_info.pitch * efifb.fb_height, 65536);
-+
-+  if ( mode_info.blue_field_pos == 16 ) {
-+    efifb.fb_mask_red = 0x000000ff;
-+    efifb.fb_mask_green = 0x0000ff00;
-+    efifb.fb_mask_blue = 0x00ff0000;
-+  }
-+
-+  if ( mode_info.blue_field_pos == 0 ) {
-+    efifb.fb_mask_red = 0x00ff0000;
-+    efifb.fb_mask_green = 0x0000ff00;
-+    efifb.fb_mask_blue = 0x000000ff;
-+  }
-+
-+  efifb.fb_mask_reserved = 0xff000000;
-+
-+  err = grub_bsd_add_meta ( FREEBSD_MODINFO_METADATA | FREEBSD_BTINFO_FRAMEBUF, &efifb, sizeof (efifb));
-+  return err;
-+}
-+#endif
-+
- static grub_err_t
- grub_freebsd_boot (void)
- {
-@@ -602,6 +670,55 @@ grub_freebsd_boot (void)
- 
-   bi.boot_device = freebsd_biosdev;
- 
-+#ifdef GRUB_MACHINE_EFI
-+  /* When booting in EFI mode, we need to export some additional kernel ACPI hints */
-+  struct grub_acpi_rsdp_v10 *v1;
-+  struct grub_acpi_rsdp_v20 *v2;
-+  v1 = grub_acpi_get_rsdpv1 ();
-+  v2 = grub_acpi_get_rsdpv2 ();
-+  if (v2 && v2->length > 40)
-+    v2 = 0;
-+
-+  int revision;
-+  char acpiBuf[24];
-+
-+  if (v1)
-+  {
-+     revision = v1->revision;
-+     if ( revision == 0 )
-+        revision = 1;
-+     grub_snprintf (acpiBuf, sizeof (acpiBuf), "%d", revision);
-+     grub_env_set("kFreeBSD.hint.acpi.0.revision", acpiBuf);
-+
-+     grub_snprintf (acpiBuf, sizeof (acpiBuf), "%s", v1->oemid);
-+     grub_env_set("kFreeBSD.hint.acpi.0.oem", acpiBuf);
-+
-+     grub_snprintf (acpiBuf, sizeof (acpiBuf), "0x%016x", v1->rsdt_addr);
-+     grub_env_set("kFreeBSD.hint.acpi.0.rsdt", acpiBuf);
-+
-+     grub_snprintf (acpiBuf, sizeof (acpiBuf), "0x%016llx", (unsigned long long)v1);
-+     grub_env_set("kFreeBSD.hint.acpi.0.rsdp", acpiBuf);
-+  }
-+
-+  if (v2)
-+  {
-+     revision = v2->rsdpv1.revision;
-+     if ( revision == 0 )
-+        revision = 1;
-+
-+     grub_snprintf (acpiBuf, sizeof (acpiBuf), "%d", revision);
-+     grub_env_set("kFreeBSD.hint.acpi.0.revision", acpiBuf);
-+
-+     grub_snprintf (acpiBuf, sizeof (acpiBuf), "0x%016llx", (unsigned long long)v2->xsdt_addr);
-+     grub_env_set("kFreeBSD.hint.acpi.0.xsdt", acpiBuf);
-+
-+     grub_snprintf (acpiBuf, sizeof (acpiBuf), "%d", v2->length);
-+     grub_env_set("kFreeBSD.hint.acpi.0.xsdt_length", acpiBuf);
-+  }
-+
-+
-+#endif
-+
-   p_size = 0;
-   FOR_SORTED_ENV (var)
-     if ((grub_memcmp (var->name, "kFreeBSD.", sizeof("kFreeBSD.") - 1) == 0) && (var->name[sizeof("kFreeBSD.") - 1]))
-@@ -687,6 +804,10 @@ grub_freebsd_boot (void)
- 		*(grub_uint32_t *) p_tag = bootflags;
- 	      break;
- 
-+	    case FREEBSD_MODINFO_METADATA | FREEBSD_BTINFO_FRAMEBUF:
-+	      grub_memcpy (p_tag, tag->data, tag->len);
-+	      break;
-+
- 	    case FREEBSD_MODINFO_METADATA | FREEBSD_MODINFOMD_ENVP:
- 	      if (is_64bit)
- 		*(grub_uint64_t *) p_tag = bi.environment;
-@@ -716,7 +837,10 @@ grub_freebsd_boot (void)
- 
-   bi.kern_end = kern_end;
- 
-+#ifndef GRUB_MACHINE_EFI
-+  /* Don't set text mode on EFI boot */
-   grub_video_set_mode ("text", 0, 0);
-+#endif
- 
-   if (is_64bit)
-     {
-@@ -1560,6 +1684,16 @@ grub_cmd_freebsd (grub_extcmd_context_t ctxt, int argc, char *argv[])
- 				   FREEBSD_MODINFOMD_KERNEND, &data, len);
- 	  if (err)
- 	    return err;
-+
-+#ifdef GRUB_MACHINE_EFI
-+	  err = grub_freebsd_setup_video ();
-+	  if (err)
-+	  {
-+	    grub_print_error ();
-+	    grub_puts_ (N_("Booting in EFI blind mode"));
-+	    grub_errno = GRUB_ERR_NONE;
-+	  }
-+#endif
- 	}
-       grub_bsd_get_device (&freebsd_biosdev, &unit, &slice, &part);
-       freebsd_zfsguid = 0;
-diff --git include/grub/i386/bsd.h include/grub/i386/bsd.h
-index 524d47a..b7bb545 100644
---- include/grub/i386/bsd.h
-+++ include/grub/i386/bsd.h
-@@ -26,6 +26,7 @@
- #include <grub/i386/netbsd_reboot.h>
- #include <grub/i386/openbsd_reboot.h>
- #include <grub/i386/freebsd_linker.h>
-+#include <grub/i386/freebsd_bootinfo.h>
- #include <grub/i386/netbsd_bootinfo.h>
- #include <grub/i386/openbsd_bootarg.h>
- 
-diff --git include/grub/i386/freebsd_bootinfo.h include/grub/i386/freebsd_bootinfo.h
-new file mode 100644
-index 0000000..17e5997
---- /dev/null
-+++ include/grub/i386/freebsd_bootinfo.h
-@@ -0,0 +1,33 @@
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 2008,2009  Free Software Foundation, Inc.
-+ *
-+ *  GRUB is free software: you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation, either version 3 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#include <grub/types.h>
-+
-+#define FREEBSD_BTINFO_FRAMEBUF  0x1005
-+
-+struct grub_freebsd_btinfo_framebuf {
-+  grub_uint64_t        fb_addr;
-+  grub_uint64_t        fb_size;
-+  grub_int32_t         fb_height;
-+  grub_int32_t         fb_width;
-+  grub_int32_t         fb_stride;
-+  grub_uint32_t        fb_mask_red;
-+  grub_uint32_t        fb_mask_green;
-+  grub_uint32_t        fb_mask_blue;
-+  grub_uint32_t        fb_mask_reserved;
-+};
--- 
-2.2.1
-
diff --git a/sysutils/grub2-efi/files/patch-include_grub_gpt__partition.h b/sysutils/grub2-efi/files/patch-include_grub_gpt__partition.h
new file mode 100644
index 000000000000..d8da78eea7b3
--- /dev/null
+++ b/sysutils/grub2-efi/files/patch-include_grub_gpt__partition.h
@@ -0,0 +1,17 @@
+--- include/grub/gpt_partition.h.orig	2014-03-03 16:00:26 UTC
++++ include/grub/gpt_partition.h
+@@ -43,6 +43,14 @@ typedef struct grub_gpt_part_type grub_g
+     { 0x74, 0x4e, 0x65, 0x65, 0x64, 0x45, 0x46, 0x49 } \
+   }
+ 
++#define GRUB_GPT_PARTITION_TYPE_FREEBSD_BOOT \
++  { grub_cpu_to_le32_compile_time (0x83bd6b9d), \
++      grub_cpu_to_le16_compile_time (0x7f41), \
++      grub_cpu_to_le16_compile_time (0x11dc),	       \
++    { 0xbe, 0x0b, 0x00, 0x15, 0x60, 0xb8, 0x4f, 0x0f } \
++  }
++
++
+ #define GRUB_GPT_PARTITION_TYPE_LDM \
+   { grub_cpu_to_le32_compile_time (0x5808C8AAU),\
+       grub_cpu_to_le16_compile_time (0x7E8F), \
diff --git a/sysutils/grub2-efi/files/patch-include_grub_i386_bsd.h b/sysutils/grub2-efi/files/patch-include_grub_i386_bsd.h
new file mode 100644
index 000000000000..3de8d0bb203e
--- /dev/null
+++ b/sysutils/grub2-efi/files/patch-include_grub_i386_bsd.h
@@ -0,0 +1,10 @@
+--- include/grub/i386/bsd.h.orig	2014-12-30 21:10:24 UTC
++++ include/grub/i386/bsd.h
+@@ -26,6 +26,7 @@
+ #include <grub/i386/netbsd_reboot.h>
+ #include <grub/i386/openbsd_reboot.h>
+ #include <grub/i386/freebsd_linker.h>
++#include <grub/i386/freebsd_bootinfo.h>
+ #include <grub/i386/netbsd_bootinfo.h>
+ #include <grub/i386/openbsd_bootarg.h>
+ 
diff --git a/sysutils/grub2-efi/files/patch-include_grub_i386_freebsd__bootinfo.h b/sysutils/grub2-efi/files/patch-include_grub_i386_freebsd__bootinfo.h
new file mode 100644
index 000000000000..359342e38066
--- /dev/null
+++ b/sysutils/grub2-efi/files/patch-include_grub_i386_freebsd__bootinfo.h
@@ -0,0 +1,36 @@
+--- include/grub/i386/freebsd_bootinfo.h.orig	2015-06-07 21:44:01 UTC
++++ include/grub/i386/freebsd_bootinfo.h
+@@ -0,0 +1,33 @@
++/*
++ *  GRUB  --  GRand Unified Bootloader
++ *  Copyright (C) 2008,2009  Free Software Foundation, Inc.
++ *
++ *  GRUB is free software: you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation, either version 3 of the License, or
++ *  (at your option) any later version.
++ *
++ *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <grub/types.h>
++
++#define FREEBSD_BTINFO_FRAMEBUF  0x1005
++
++struct grub_freebsd_btinfo_framebuf {
++  grub_uint64_t        fb_addr;
++  grub_uint64_t        fb_size;
++  grub_int32_t         fb_height;
++  grub_int32_t         fb_width;
++  grub_int32_t         fb_stride;
++  grub_uint32_t        fb_mask_red;
++  grub_uint32_t        fb_mask_green;
++  grub_uint32_t        fb_mask_blue;
++  grub_uint32_t        fb_mask_reserved;
++};
diff --git a/sysutils/grub2-efi/files/patch-po_LINGUAS b/sysutils/grub2-efi/files/patch-po_LINGUAS
new file mode 100644
index 000000000000..2dbcb6e4d4cc
--- /dev/null
+++ b/sysutils/grub2-efi/files/patch-po_LINGUAS
@@ -0,0 +1,5 @@
+--- po/LINGUAS.orig	2015-01-30 16:30:32 UTC
++++ po/LINGUAS
+@@ -1 +1 @@
+-ast ca da de de@hebrew de_CH en@arabic en@cyrillic en@greek en@hebrew en@piglatin en@quot eo es fi fr gl hu id it ja lt nb nl pa pl pt_BR ru sl sv tr uk vi zh_CN zh_TW
++ast ca da de eo es fi fr gl hu id it ja lt nb nl pa pl pt_BR ru sl sv tr uk vi zh_CN zh_TW
diff --git a/sysutils/grub2-efi/pkg-plist b/sysutils/grub2-efi/pkg-plist
index 9abb56c7c400..c512c40925dc 100644
--- a/sysutils/grub2-efi/pkg-plist
+++ b/sysutils/grub2-efi/pkg-plist
@@ -1,422 +1,47 @@
-lib/grub/x86_64-efi/terminfo.module
-lib/grub/x86_64-efi/priority_queue.module
-lib/grub/x86_64-efi/gettext.mod
-lib/grub/x86_64-efi/hdparm.module
-lib/grub/x86_64-efi/hello.mod
-lib/grub/x86_64-efi/functional_test.mod
-lib/grub/x86_64-efi/net.module
-lib/grub/x86_64-efi/bitmap.mod
-lib/grub/x86_64-efi/jpeg.module
-lib/grub/x86_64-efi/png.mod
-lib/grub/x86_64-efi/sfs.mod
-lib/grub/x86_64-efi/lvm.mod
-lib/grub/x86_64-efi/ext2.module
-lib/grub/x86_64-efi/testload.mod
-lib/grub/x86_64-efi/cpio_be.module
-lib/grub/x86_64-efi/test_blockarg.module
-lib/grub/x86_64-efi/fixvideo.mod
-lib/grub/x86_64-efi/ohci.mod
-lib/grub/x86_64-efi/nilfs2.mod
-lib/grub/x86_64-efi/tar.mod
-lib/grub/x86_64-efi/datetime.mod
-lib/grub/x86_64-efi/usbserial_common.mod
-lib/grub/x86_64-efi/gcry_md5.mod
-lib/grub/x86_64-efi/crc64.module
-lib/grub/x86_64-efi/usb.mod
-lib/grub/x86_64-efi/video_fb.mod
-lib/grub/x86_64-efi/multiboot2.module
-lib/grub/x86_64-efi/gcry_sha1.module
-lib/grub/x86_64-efi/memrw.mod
-lib/grub/x86_64-efi/udf.mod
-lib/grub/x86_64-efi/cryptodisk.mod
-lib/grub/x86_64-efi/net.mod
+lib/grub/x86_64-efi/acpi.mod
+lib/grub/x86_64-efi/acpi.module
+lib/grub/x86_64-efi/adler32.mod
+lib/grub/x86_64-efi/adler32.module
+lib/grub/x86_64-efi/affs.mod
+lib/grub/x86_64-efi/affs.module
+lib/grub/x86_64-efi/afs.mod
 lib/grub/x86_64-efi/afs.module
-lib/grub/x86_64-efi/bufio.module
-lib/grub/x86_64-efi/lsefisystab.module
-lib/grub/x86_64-efi/uhci.mod
-lib/grub/x86_64-efi/iorw.mod
+lib/grub/x86_64-efi/ahci.mod
 lib/grub/x86_64-efi/ahci.module
-lib/grub/x86_64-efi/ufs2.mod
-lib/grub/x86_64-efi/gcry_sha512.module
-lib/grub/x86_64-efi/gcry_crc.module
-lib/grub/x86_64-efi/part_gpt.module
-lib/grub/x86_64-efi/hdparm.mod
-lib/grub/x86_64-efi/cpuid.module
-lib/grub/x86_64-efi/part_acorn.module
-lib/grub/x86_64-efi/gmodule.pl
-lib/grub/x86_64-efi/backtrace.module
-lib/grub/x86_64-efi/minix3.module
-lib/grub/x86_64-efi/iso9660.mod
-lib/grub/x86_64-efi/xnu_uuid.mod
-lib/grub/x86_64-efi/linux.mod
-lib/grub/x86_64-efi/cat.mod
-lib/grub/x86_64-efi/geli.module
-lib/grub/x86_64-efi/geli.mod
-lib/grub/x86_64-efi/loadenv.mod
-lib/grub/x86_64-efi/minix3_be.mod
-lib/grub/x86_64-efi/echo.module
+lib/grub/x86_64-efi/all_video.mod
+lib/grub/x86_64-efi/all_video.module
+lib/grub/x86_64-efi/aout.mod
+lib/grub/x86_64-efi/aout.module
+lib/grub/x86_64-efi/appleldr.mod
 lib/grub/x86_64-efi/appleldr.module
-lib/grub/x86_64-efi/crypto.lst
-lib/grub/x86_64-efi/serial.module
-lib/grub/x86_64-efi/gcry_serpent.module
-lib/grub/x86_64-efi/iso9660.module
-lib/grub/x86_64-efi/videotest.mod
-lib/grub/x86_64-efi/search_fs_file.mod
-lib/grub/x86_64-efi/halt.module
-lib/grub/x86_64-efi/xnu_uuid.module
-lib/grub/x86_64-efi/minix.mod
-lib/grub/x86_64-efi/tga.module
-lib/grub/x86_64-efi/password.mod
-lib/grub/x86_64-efi/relocator.mod
-lib/grub/x86_64-efi/fat.module
-lib/grub/x86_64-efi/zfsinfo.module
-lib/grub/x86_64-efi/search_label.module
-lib/grub/x86_64-efi/odc.module
-lib/grub/x86_64-efi/luks.mod
-lib/grub/x86_64-efi/gcry_crc.mod
-lib/grub/x86_64-efi/ldm.module
-lib/grub/x86_64-efi/reiserfs.module
-lib/grub/x86_64-efi/loopback.module
-lib/grub/x86_64-efi/part_plan.module
-lib/grub/x86_64-efi/elf.module
-lib/grub/x86_64-efi/gcry_blowfish.module
-lib/grub/x86_64-efi/usbserial_pl2303.module
-lib/grub/x86_64-efi/xfs.module
-lib/grub/x86_64-efi/play.module
-lib/grub/x86_64-efi/hashsum.module
-lib/grub/x86_64-efi/lsacpi.module
-lib/grub/x86_64-efi/romfs.module
-lib/grub/x86_64-efi/gcry_rijndael.module
-lib/grub/x86_64-efi/datehook.module
-lib/grub/x86_64-efi/jfs.mod
-lib/grub/x86_64-efi/mdraid1x.module
-lib/grub/x86_64-efi/gcry_des.module
-lib/grub/x86_64-efi/affs.module
-lib/grub/x86_64-efi/functional_test.module
-lib/grub/x86_64-efi/ehci.module
-lib/grub/x86_64-efi/bitmap_scale.mod
-lib/grub/x86_64-efi/efi_gop.module
-lib/grub/x86_64-efi/ufs2.module
-lib/grub/x86_64-efi/video.module
-lib/grub/x86_64-efi/date.module
-lib/grub/x86_64-efi/bsd.mod
-lib/grub/x86_64-efi/lsefimmap.module
-lib/grub/x86_64-efi/command.lst
-lib/grub/x86_64-efi/minix2.mod
-lib/grub/x86_64-efi/gcry_camellia.module
-lib/grub/x86_64-efi/exfat.mod
-lib/grub/x86_64-efi/memrw.module
-lib/grub/x86_64-efi/configfile.module
-lib/grub/x86_64-efi/scsi.module
-lib/grub/x86_64-efi/gcry_cast5.module
-lib/grub/x86_64-efi/password_pbkdf2.mod
-lib/grub/x86_64-efi/zfscrypt.mod
-lib/grub/x86_64-efi/search_label.mod
-lib/grub/x86_64-efi/gcry_md5.module
-lib/grub/x86_64-efi/trig.module
-lib/grub/x86_64-efi/reiserfs.mod
-lib/grub/x86_64-efi/normal.mod
-lib/grub/x86_64-efi/gettext.module
-lib/grub/x86_64-efi/btrfs.module
-lib/grub/x86_64-efi/part_sun.mod
-lib/grub/x86_64-efi/lsefimmap.mod
-lib/grub/x86_64-efi/hfsplus.module
-lib/grub/x86_64-efi/gcry_md4.mod
-lib/grub/x86_64-efi/exfctest.mod
-lib/grub/x86_64-efi/keystatus.module
-lib/grub/x86_64-efi/iorw.module
-lib/grub/x86_64-efi/kernel.exec
+lib/grub/x86_64-efi/archelp.mod
+lib/grub/x86_64-efi/archelp.module
+lib/grub/x86_64-efi/at_keyboard.mod
 lib/grub/x86_64-efi/at_keyboard.module
-lib/grub/x86_64-efi/gcry_seed.mod
-lib/grub/x86_64-efi/parttool.module
-lib/grub/x86_64-efi/aout.module
 lib/grub/x86_64-efi/ata.mod
-lib/grub/x86_64-efi/gfxmenu.module
-lib/grub/x86_64-efi/terminal.module
-lib/grub/x86_64-efi/gcry_rfc2268.module
-lib/grub/x86_64-efi/newc.mod
-lib/grub/x86_64-efi/mdraid09.mod
-lib/grub/x86_64-efi/relocator.module
-lib/grub/x86_64-efi/videotest.module
 lib/grub/x86_64-efi/ata.module
-lib/grub/x86_64-efi/zfsinfo.mod
-lib/grub/x86_64-efi/minix.module
-lib/grub/x86_64-efi/password.module
-lib/grub/x86_64-efi/gptsync.module
-lib/grub/x86_64-efi/lzopio.mod
-lib/grub/x86_64-efi/part_amiga.module
-lib/grub/x86_64-efi/videoinfo.mod
-lib/grub/x86_64-efi/msdospart.module
-lib/grub/x86_64-efi/search_fs_uuid.module
-lib/grub/x86_64-efi/squash4.module
-lib/grub/x86_64-efi/usbms.module
-lib/grub/x86_64-efi/part_dvh.module
-lib/grub/x86_64-efi/loadenv.module
-lib/grub/x86_64-efi/xnu.module
-lib/grub/x86_64-efi/keylayouts.mod
-lib/grub/x86_64-efi/jpeg.mod
-lib/grub/x86_64-efi/ntfscomp.module
-lib/grub/x86_64-efi/efi_uga.mod
-lib/grub/x86_64-efi/ohci.module
-lib/grub/x86_64-efi/moddep.lst
-lib/grub/x86_64-efi/hfs.module
-lib/grub/x86_64-efi/minix3.mod
-lib/grub/x86_64-efi/pbkdf2.module
-lib/grub/x86_64-efi/terminal.lst
-lib/grub/x86_64-efi/efi_gop.mod
-lib/grub/x86_64-efi/usbserial_common.module
-lib/grub/x86_64-efi/part_plan.mod
-lib/grub/x86_64-efi/raid5rec.mod
-lib/grub/x86_64-efi/setpci.module
-lib/grub/x86_64-efi/adler32.mod
-lib/grub/x86_64-efi/fshelp.module
-lib/grub/x86_64-efi/gcry_rijndael.mod
-lib/grub/x86_64-efi/probe.mod
-lib/grub/x86_64-efi/all_video.mod
-lib/grub/x86_64-efi/udf.module
-lib/grub/x86_64-efi/true.module
-lib/grub/x86_64-efi/acpi.module
-lib/grub/x86_64-efi/kernel.img
-lib/grub/x86_64-efi/video.lst
-lib/grub/x86_64-efi/http.mod
-lib/grub/x86_64-efi/diskfilter.module
-lib/grub/x86_64-efi/play.mod
-lib/grub/x86_64-efi/minix_be.mod
-lib/grub/x86_64-efi/gcry_whirlpool.module
-lib/grub/x86_64-efi/multiboot2.mod
-lib/grub/x86_64-efi/part_gpt.mod
-lib/grub/x86_64-efi/lssal.module
-lib/grub/x86_64-efi/usb_keyboard.mod
-lib/grub/x86_64-efi/mdraid1x.mod
-lib/grub/x86_64-efi/part_apple.module
-lib/grub/x86_64-efi/datehook.mod
-lib/grub/x86_64-efi/video_bochs.module
-lib/grub/x86_64-efi/part_apple.mod
-lib/grub/x86_64-efi/cpuid.mod
-lib/grub/x86_64-efi/squash4.mod
-lib/grub/x86_64-efi/test_blockarg.mod
-lib/grub/x86_64-efi/cpio.mod
-lib/grub/x86_64-efi/minix_be.module
-lib/grub/x86_64-efi/hfs.mod
-lib/grub/x86_64-efi/modinfo.sh
-lib/grub/x86_64-efi/lsacpi.mod
-lib/grub/x86_64-efi/parttool.mod
-lib/grub/x86_64-efi/blocklist.module
-lib/grub/x86_64-efi/all_video.module
-lib/grub/x86_64-efi/ntfs.mod
-lib/grub/x86_64-efi/pbkdf2.mod
-lib/grub/x86_64-efi/gcry_arcfour.module
-lib/grub/x86_64-efi/newc.module
-lib/grub/x86_64-efi/appleldr.mod
-lib/grub/x86_64-efi/partmap.lst
-lib/grub/x86_64-efi/lsmmap.mod
-lib/grub/x86_64-efi/xzio.mod
-lib/grub/x86_64-efi/gcry_sha1.mod
-lib/grub/x86_64-efi/gcry_sha256.module
-lib/grub/x86_64-efi/gzio.module
-lib/grub/x86_64-efi/extcmd.mod
-lib/grub/x86_64-efi/trig.mod
-lib/grub/x86_64-efi/gcry_tiger.module
-lib/grub/x86_64-efi/exfat.module
-lib/grub/x86_64-efi/datetime.module
-lib/grub/x86_64-efi/extcmd.module
-lib/grub/x86_64-efi/gcry_rmd160.mod
-lib/grub/x86_64-efi/gcry_seed.module
-lib/grub/x86_64-efi/hexdump.mod
-lib/grub/x86_64-efi/terminfo.mod
-lib/grub/x86_64-efi/gdb_grub
-lib/grub/x86_64-efi/echo.mod
-lib/grub/x86_64-efi/loopback.mod
-lib/grub/x86_64-efi/affs.mod
-lib/grub/x86_64-efi/loadbios.module
-lib/grub/x86_64-efi/configfile.mod
-lib/grub/x86_64-efi/multiboot.mod
-lib/grub/x86_64-efi/multiboot.module
-lib/grub/x86_64-efi/boot.module
-lib/grub/x86_64-efi/fat.mod
-lib/grub/x86_64-efi/nilfs2.module
-lib/grub/x86_64-efi/lssal.mod
-lib/grub/x86_64-efi/usb_keyboard.module
-lib/grub/x86_64-efi/gcry_des.mod
-lib/grub/x86_64-efi/part_sunpc.module
-lib/grub/x86_64-efi/usb.module
-lib/grub/x86_64-efi/minicmd.mod
-lib/grub/x86_64-efi/raid5rec.module
-lib/grub/x86_64-efi/mdraid09.module
-lib/grub/x86_64-efi/lsefisystab.mod
-lib/grub/x86_64-efi/gcry_blowfish.mod
-lib/grub/x86_64-efi/lsmmap.module
-lib/grub/x86_64-efi/lspci.mod
-lib/grub/x86_64-efi/tga.mod
-lib/grub/x86_64-efi/mdraid09_be.module
-lib/grub/x86_64-efi/part_bsd.module
-lib/grub/x86_64-efi/boot.mod
-lib/grub/x86_64-efi/zfs.module
-lib/grub/x86_64-efi/xzio.module
-lib/grub/x86_64-efi/raid6rec.module
-lib/grub/x86_64-efi/crypto.mod
-lib/grub/x86_64-efi/xnu.mod
-lib/grub/x86_64-efi/loadbios.mod
-lib/grub/x86_64-efi/raid6rec.mod
-lib/grub/x86_64-efi/hello.module
-lib/grub/x86_64-efi/date.mod
-lib/grub/x86_64-efi/msdospart.mod
-lib/grub/x86_64-efi/usbserial_ftdi.module
-lib/grub/x86_64-efi/ldm.mod
 lib/grub/x86_64-efi/backtrace.mod
-lib/grub/x86_64-efi/gcry_twofish.module
-lib/grub/x86_64-efi/pata.mod
-lib/grub/x86_64-efi/cs5536.mod
-lib/grub/x86_64-efi/bsd.module
-lib/grub/x86_64-efi/hfsplus.mod
-lib/grub/x86_64-efi/part_amiga.mod
-lib/grub/x86_64-efi/minicmd.module
-lib/grub/x86_64-efi/bitmap.module
-lib/grub/x86_64-efi/btrfs.mod
-lib/grub/x86_64-efi/gcry_md4.module
-lib/grub/x86_64-efi/keylayouts.module
-lib/grub/x86_64-efi/luks.module
-lib/grub/x86_64-efi/regexp.mod
-lib/grub/x86_64-efi/usbms.mod
-lib/grub/x86_64-efi/setjmp.module
-lib/grub/x86_64-efi/test.module
-lib/grub/x86_64-efi/cat.module
-lib/grub/x86_64-efi/chain.mod
-lib/grub/x86_64-efi/exfctest.module
-lib/grub/x86_64-efi/crc64.mod
-lib/grub/x86_64-efi/uhci.module
-lib/grub/x86_64-efi/elf.mod
-lib/grub/x86_64-efi/dm_nv.mod
-lib/grub/x86_64-efi/ntfscomp.mod
-lib/grub/x86_64-efi/gcry_sha512.mod
-lib/grub/x86_64-efi/time.mod
-lib/grub/x86_64-efi/true.mod
-lib/grub/x86_64-efi/regexp.module
-lib/grub/x86_64-efi/video_fb.module
-lib/grub/x86_64-efi/help.mod
-lib/grub/x86_64-efi/romfs.mod
-lib/grub/x86_64-efi/zfs.mod
-lib/grub/x86_64-efi/search.module
-lib/grub/x86_64-efi/read.mod
-lib/grub/x86_64-efi/ls.module
-lib/grub/x86_64-efi/gcry_twofish.mod
-lib/grub/x86_64-efi/http.module
-lib/grub/x86_64-efi/efinet.mod
-lib/grub/x86_64-efi/linux.module
+lib/grub/x86_64-efi/backtrace.module
 lib/grub/x86_64-efi/bfs.mod
-lib/grub/x86_64-efi/mdraid09_be.mod
-lib/grub/x86_64-efi/tar.module
-lib/grub/x86_64-efi/tftp.module
-lib/grub/x86_64-efi/video_bochs.mod
-lib/grub/x86_64-efi/fs.lst
-lib/grub/x86_64-efi/ehci.mod
-lib/grub/x86_64-efi/gfxterm.module
-lib/grub/x86_64-efi/efi_uga.module
-lib/grub/x86_64-efi/help.module
-lib/grub/x86_64-efi/lzopio.module
-lib/grub/x86_64-efi/sleep.module
-lib/grub/x86_64-efi/font.mod
-lib/grub/x86_64-efi/gcry_sha256.mod
-lib/grub/x86_64-efi/fshelp.mod
-lib/grub/x86_64-efi/part_msdos.module
-lib/grub/x86_64-efi/gfxterm.mod
-lib/grub/x86_64-efi/usbtest.module
-lib/grub/x86_64-efi/cs5536.module
-lib/grub/x86_64-efi/diskfilter.mod
-lib/grub/x86_64-efi/ntfs.module
-lib/grub/x86_64-efi/ufs1.module
-lib/grub/x86_64-efi/parttool.lst
-lib/grub/x86_64-efi/gcry_camellia.mod
-lib/grub/x86_64-efi/crypto.module
-lib/grub/x86_64-efi/gfxmenu.mod
-lib/grub/x86_64-efi/usbserial_pl2303.mod
+lib/grub/x86_64-efi/bfs.module
+lib/grub/x86_64-efi/bitmap.mod
+lib/grub/x86_64-efi/bitmap.module
+lib/grub/x86_64-efi/bitmap_scale.mod
 lib/grub/x86_64-efi/bitmap_scale.module
-lib/grub/x86_64-efi/gcry_rfc2268.mod
-lib/grub/x86_64-efi/halt.mod
 lib/grub/x86_64-efi/blocklist.mod
-lib/grub/x86_64-efi/password_pbkdf2.module
-lib/grub/x86_64-efi/scsi.mod
-lib/grub/x86_64-efi/minix2_be.module
-lib/grub/x86_64-efi/usbserial_ftdi.mod
-lib/grub/x86_64-efi/search_fs_file.module
-lib/grub/x86_64-efi/search_fs_uuid.mod
-lib/grub/x86_64-efi/jfs.module
-lib/grub/x86_64-efi/gcry_rmd160.module
-lib/grub/x86_64-efi/minix2.module
-lib/grub/x86_64-efi/part_dvh.mod
-lib/grub/x86_64-efi/hexdump.module
-lib/grub/x86_64-efi/lspci.module
-lib/grub/x86_64-efi/tftp.mod
-lib/grub/x86_64-efi/gcry_serpent.mod
-lib/grub/x86_64-efi/part_bsd.mod
-lib/grub/x86_64-efi/minix3_be.module
-lib/grub/x86_64-efi/font.module
-lib/grub/x86_64-efi/reboot.mod
-lib/grub/x86_64-efi/gcry_tiger.mod
-lib/grub/x86_64-efi/pata.module
-lib/grub/x86_64-efi/fixvideo.module
-lib/grub/x86_64-efi/memdisk.module
-lib/grub/x86_64-efi/ext2.mod
-lib/grub/x86_64-efi/setjmp.mod
-lib/grub/x86_64-efi/setpci.mod
-lib/grub/x86_64-efi/part_msdos.mod
+lib/grub/x86_64-efi/blocklist.module
+lib/grub/x86_64-efi/boot.mod
+lib/grub/x86_64-efi/boot.module
+lib/grub/x86_64-efi/bsd.mod
+lib/grub/x86_64-efi/bsd.module
+lib/grub/x86_64-efi/bswap_test.mod
+lib/grub/x86_64-efi/bswap_test.module
+lib/grub/x86_64-efi/btrfs.mod
+lib/grub/x86_64-efi/btrfs.module
 lib/grub/x86_64-efi/bufio.mod
-lib/grub/x86_64-efi/part_acorn.mod
-lib/grub/x86_64-efi/hashsum.mod
-lib/grub/x86_64-efi/gcry_cast5.mod
-lib/grub/x86_64-efi/cryptodisk.module
-lib/grub/x86_64-efi/gcry_arcfour.mod
-lib/grub/x86_64-efi/afs.mod
-lib/grub/x86_64-efi/aout.mod
-lib/grub/x86_64-efi/gptsync.mod
-lib/grub/x86_64-efi/terminal.mod
-lib/grub/x86_64-efi/video_cirrus.mod
-lib/grub/x86_64-efi/cpio.module
-lib/grub/x86_64-efi/videoinfo.module
-lib/grub/x86_64-efi/keystatus.mod
-lib/grub/x86_64-efi/part_sunpc.mod
-lib/grub/x86_64-efi/video.mod
-lib/grub/x86_64-efi/gcry_whirlpool.mod
-lib/grub/x86_64-efi/testload.module
-lib/grub/x86_64-efi/video_cirrus.module
-lib/grub/x86_64-efi/mmap.module
-lib/grub/x86_64-efi/zfscrypt.module
-lib/grub/x86_64-efi/dm_nv.module
-lib/grub/x86_64-efi/time.module
-lib/grub/x86_64-efi/part_sun.module
-lib/grub/x86_64-efi/memdisk.mod
-lib/grub/x86_64-efi/reboot.module
-lib/grub/x86_64-efi/probe.module
-lib/grub/x86_64-efi/mmap.mod
-lib/grub/x86_64-efi/cmp.module
-lib/grub/x86_64-efi/acpi.mod
-lib/grub/x86_64-efi/lvm.module
-lib/grub/x86_64-efi/cpio_be.mod
-lib/grub/x86_64-efi/xfs.mod
-lib/grub/x86_64-efi/ls.mod
-lib/grub/x86_64-efi/bfs.module
-lib/grub/x86_64-efi/usbtest.mod
-lib/grub/x86_64-efi/sfs.module
-lib/grub/x86_64-efi/odc.mod
-lib/grub/x86_64-efi/efinet.module
-lib/grub/x86_64-efi/search.mod
-lib/grub/x86_64-efi/priority_queue.mod
-lib/grub/x86_64-efi/sleep.mod
-lib/grub/x86_64-efi/adler32.module
-lib/grub/x86_64-efi/at_keyboard.mod
-lib/grub/x86_64-efi/minix2_be.mod
-lib/grub/x86_64-efi/serial.mod
-lib/grub/x86_64-efi/ahci.mod
-lib/grub/x86_64-efi/test.mod
-lib/grub/x86_64-efi/normal.module
-lib/grub/x86_64-efi/png.module
-lib/grub/x86_64-efi/chain.module
-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/bufio.module
+lib/grub/x86_64-efi/cat.mod
+lib/grub/x86_64-efi/cat.module
 lib/grub/x86_64-efi/cbfs.mod
 lib/grub/x86_64-efi/cbfs.module
 lib/grub/x86_64-efi/cbls.mod
@@ -427,83 +52,470 @@ 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/chain.mod
+lib/grub/x86_64-efi/chain.module
 lib/grub/x86_64-efi/cmdline_cat_test.mod
 lib/grub/x86_64-efi/cmdline_cat_test.module
+lib/grub/x86_64-efi/cmp.mod
+lib/grub/x86_64-efi/cmp.module
+lib/grub/x86_64-efi/cmp_test.mod
+lib/grub/x86_64-efi/cmp_test.module
+lib/grub/x86_64-efi/command.lst
+lib/grub/x86_64-efi/configfile.mod
+lib/grub/x86_64-efi/configfile.module
+lib/grub/x86_64-efi/cpio.mod
+lib/grub/x86_64-efi/cpio.module
+lib/grub/x86_64-efi/cpio_be.mod
+lib/grub/x86_64-efi/cpio_be.module
+lib/grub/x86_64-efi/cpuid.mod
+lib/grub/x86_64-efi/cpuid.module
+lib/grub/x86_64-efi/crc64.mod
+lib/grub/x86_64-efi/crc64.module
+lib/grub/x86_64-efi/crypto.lst
+lib/grub/x86_64-efi/crypto.mod
+lib/grub/x86_64-efi/crypto.module
+lib/grub/x86_64-efi/cryptodisk.mod
+lib/grub/x86_64-efi/cryptodisk.module
+lib/grub/x86_64-efi/cs5536.mod
+lib/grub/x86_64-efi/cs5536.module
+lib/grub/x86_64-efi/ctz_test.mod
+lib/grub/x86_64-efi/ctz_test.module
+lib/grub/x86_64-efi/date.mod
+lib/grub/x86_64-efi/date.module
+lib/grub/x86_64-efi/datehook.mod
+lib/grub/x86_64-efi/datehook.module
+lib/grub/x86_64-efi/datetime.mod
+lib/grub/x86_64-efi/datetime.module
 lib/grub/x86_64-efi/disk.mod
 lib/grub/x86_64-efi/disk.module
+lib/grub/x86_64-efi/diskfilter.mod
+lib/grub/x86_64-efi/diskfilter.module
+lib/grub/x86_64-efi/div.mod
+lib/grub/x86_64-efi/div.module
 lib/grub/x86_64-efi/div_test.mod
 lib/grub/x86_64-efi/div_test.module
+lib/grub/x86_64-efi/dm_nv.mod
+lib/grub/x86_64-efi/dm_nv.module
+lib/grub/x86_64-efi/echo.mod
+lib/grub/x86_64-efi/echo.module
+lib/grub/x86_64-efi/efi_gop.mod
+lib/grub/x86_64-efi/efi_gop.module
+lib/grub/x86_64-efi/efi_uga.mod
+lib/grub/x86_64-efi/efi_uga.module
 lib/grub/x86_64-efi/efifwsetup.mod
 lib/grub/x86_64-efi/efifwsetup.module
+lib/grub/x86_64-efi/efinet.mod
+lib/grub/x86_64-efi/efinet.module
+lib/grub/x86_64-efi/ehci.mod
+lib/grub/x86_64-efi/ehci.module
+lib/grub/x86_64-efi/elf.mod
+lib/grub/x86_64-efi/elf.module
 lib/grub/x86_64-efi/eval.mod
 lib/grub/x86_64-efi/eval.module
+lib/grub/x86_64-efi/exfat.mod
+lib/grub/x86_64-efi/exfat.module
+lib/grub/x86_64-efi/exfctest.mod
+lib/grub/x86_64-efi/exfctest.module
+lib/grub/x86_64-efi/ext2.mod
+lib/grub/x86_64-efi/ext2.module
+lib/grub/x86_64-efi/extcmd.mod
+lib/grub/x86_64-efi/extcmd.module
+lib/grub/x86_64-efi/fat.mod
+lib/grub/x86_64-efi/fat.module
 lib/grub/x86_64-efi/file.mod
 lib/grub/x86_64-efi/file.module
+lib/grub/x86_64-efi/fixvideo.mod
+lib/grub/x86_64-efi/fixvideo.module
+lib/grub/x86_64-efi/font.mod
+lib/grub/x86_64-efi/font.module
+lib/grub/x86_64-efi/fs.lst
+lib/grub/x86_64-efi/fshelp.mod
+lib/grub/x86_64-efi/fshelp.module
+lib/grub/x86_64-efi/functional_test.mod
+lib/grub/x86_64-efi/functional_test.module
+lib/grub/x86_64-efi/gcry_arcfour.mod
+lib/grub/x86_64-efi/gcry_arcfour.module
+lib/grub/x86_64-efi/gcry_blowfish.mod
+lib/grub/x86_64-efi/gcry_blowfish.module
+lib/grub/x86_64-efi/gcry_camellia.mod
+lib/grub/x86_64-efi/gcry_camellia.module
+lib/grub/x86_64-efi/gcry_cast5.mod
+lib/grub/x86_64-efi/gcry_cast5.module
+lib/grub/x86_64-efi/gcry_crc.mod
+lib/grub/x86_64-efi/gcry_crc.module
+lib/grub/x86_64-efi/gcry_des.mod
+lib/grub/x86_64-efi/gcry_des.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_md4.mod
+lib/grub/x86_64-efi/gcry_md4.module
+lib/grub/x86_64-efi/gcry_md5.mod
+lib/grub/x86_64-efi/gcry_md5.module
+lib/grub/x86_64-efi/gcry_rfc2268.mod
+lib/grub/x86_64-efi/gcry_rfc2268.module
+lib/grub/x86_64-efi/gcry_rijndael.mod
+lib/grub/x86_64-efi/gcry_rijndael.module
+lib/grub/x86_64-efi/gcry_rmd160.mod
+lib/grub/x86_64-efi/gcry_rmd160.module
 lib/grub/x86_64-efi/gcry_rsa.mod
 lib/grub/x86_64-efi/gcry_rsa.module
+lib/grub/x86_64-efi/gcry_seed.mod
+lib/grub/x86_64-efi/gcry_seed.module
+lib/grub/x86_64-efi/gcry_serpent.mod
+lib/grub/x86_64-efi/gcry_serpent.module
+lib/grub/x86_64-efi/gcry_sha1.mod
+lib/grub/x86_64-efi/gcry_sha1.module
+lib/grub/x86_64-efi/gcry_sha256.mod
+lib/grub/x86_64-efi/gcry_sha256.module
+lib/grub/x86_64-efi/gcry_sha512.mod
+lib/grub/x86_64-efi/gcry_sha512.module
+lib/grub/x86_64-efi/gcry_tiger.mod
+lib/grub/x86_64-efi/gcry_tiger.module
+lib/grub/x86_64-efi/gcry_twofish.mod
+lib/grub/x86_64-efi/gcry_twofish.module
+lib/grub/x86_64-efi/gcry_whirlpool.mod
+lib/grub/x86_64-efi/gcry_whirlpool.module
+lib/grub/x86_64-efi/gdb_grub
+lib/grub/x86_64-efi/geli.mod
+lib/grub/x86_64-efi/geli.module
+lib/grub/x86_64-efi/gettext.mod
+lib/grub/x86_64-efi/gettext.module
+lib/grub/x86_64-efi/gfxmenu.mod
+lib/grub/x86_64-efi/gfxmenu.module
+lib/grub/x86_64-efi/gfxterm.mod
+lib/grub/x86_64-efi/gfxterm.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/gmodule.pl
+lib/grub/x86_64-efi/gptsync.mod
+lib/grub/x86_64-efi/gptsync.module
+lib/grub/x86_64-efi/gzio.mod
+lib/grub/x86_64-efi/gzio.module
+lib/grub/x86_64-efi/halt.mod
+lib/grub/x86_64-efi/halt.module
+lib/grub/x86_64-efi/hashsum.mod
+lib/grub/x86_64-efi/hashsum.module
+lib/grub/x86_64-efi/hdparm.mod
+lib/grub/x86_64-efi/hdparm.module
+lib/grub/x86_64-efi/hello.mod
+lib/grub/x86_64-efi/hello.module
+lib/grub/x86_64-efi/help.mod
+lib/grub/x86_64-efi/help.module
+lib/grub/x86_64-efi/hexdump.mod
+lib/grub/x86_64-efi/hexdump.module
+lib/grub/x86_64-efi/hfs.mod
+lib/grub/x86_64-efi/hfs.module
+lib/grub/x86_64-efi/hfsplus.mod
+lib/grub/x86_64-efi/hfsplus.module
 lib/grub/x86_64-efi/hfspluscomp.mod
 lib/grub/x86_64-efi/hfspluscomp.module
+lib/grub/x86_64-efi/http.mod
+lib/grub/x86_64-efi/http.module
+lib/grub/x86_64-efi/iorw.mod
+lib/grub/x86_64-efi/iorw.module
+lib/grub/x86_64-efi/iso9660.mod
+lib/grub/x86_64-efi/iso9660.module
+lib/grub/x86_64-efi/jfs.mod
+lib/grub/x86_64-efi/jfs.module
+lib/grub/x86_64-efi/jpeg.mod
+lib/grub/x86_64-efi/jpeg.module
+lib/grub/x86_64-efi/kernel.exec
+lib/grub/x86_64-efi/kernel.img
+lib/grub/x86_64-efi/keylayouts.mod
+lib/grub/x86_64-efi/keylayouts.module
+lib/grub/x86_64-efi/keystatus.mod
+lib/grub/x86_64-efi/keystatus.module
+lib/grub/x86_64-efi/ldm.mod
+lib/grub/x86_64-efi/ldm.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/linux.mod
+lib/grub/x86_64-efi/linux.module
 lib/grub/x86_64-efi/linux16.mod
 lib/grub/x86_64-efi/linux16.module
+lib/grub/x86_64-efi/loadbios.mod
+lib/grub/x86_64-efi/loadbios.module
+lib/grub/x86_64-efi/loadenv.mod
+lib/grub/x86_64-efi/loadenv.module
+lib/grub/x86_64-efi/loopback.mod
+lib/grub/x86_64-efi/loopback.module
+lib/grub/x86_64-efi/ls.mod
+lib/grub/x86_64-efi/ls.module
+lib/grub/x86_64-efi/lsacpi.mod
+lib/grub/x86_64-efi/lsacpi.module
 lib/grub/x86_64-efi/lsefi.mod
 lib/grub/x86_64-efi/lsefi.module
+lib/grub/x86_64-efi/lsefimmap.mod
+lib/grub/x86_64-efi/lsefimmap.module
+lib/grub/x86_64-efi/lsefisystab.mod
+lib/grub/x86_64-efi/lsefisystab.module
+lib/grub/x86_64-efi/lsmmap.mod
+lib/grub/x86_64-efi/lsmmap.module
+lib/grub/x86_64-efi/lspci.mod
+lib/grub/x86_64-efi/lspci.module
+lib/grub/x86_64-efi/lssal.mod
+lib/grub/x86_64-efi/lssal.module
+lib/grub/x86_64-efi/luks.mod
+lib/grub/x86_64-efi/luks.module
+lib/grub/x86_64-efi/lvm.mod
+lib/grub/x86_64-efi/lvm.module
+lib/grub/x86_64-efi/lzopio.mod
+lib/grub/x86_64-efi/lzopio.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/mdraid09.mod
+lib/grub/x86_64-efi/mdraid09.module
+lib/grub/x86_64-efi/mdraid09_be.mod
+lib/grub/x86_64-efi/mdraid09_be.module
+lib/grub/x86_64-efi/mdraid1x.mod
+lib/grub/x86_64-efi/mdraid1x.module
+lib/grub/x86_64-efi/memdisk.mod
+lib/grub/x86_64-efi/memdisk.module
+lib/grub/x86_64-efi/memrw.mod
+lib/grub/x86_64-efi/memrw.module
+lib/grub/x86_64-efi/minicmd.mod
+lib/grub/x86_64-efi/minicmd.module
+lib/grub/x86_64-efi/minix.mod
+lib/grub/x86_64-efi/minix.module
+lib/grub/x86_64-efi/minix2.mod
+lib/grub/x86_64-efi/minix2.module
+lib/grub/x86_64-efi/minix2_be.mod
+lib/grub/x86_64-efi/minix2_be.module
+lib/grub/x86_64-efi/minix3.mod
+lib/grub/x86_64-efi/minix3.module
+lib/grub/x86_64-efi/minix3_be.mod
+lib/grub/x86_64-efi/minix3_be.module
+lib/grub/x86_64-efi/minix_be.mod
+lib/grub/x86_64-efi/minix_be.module
+lib/grub/x86_64-efi/mmap.mod
+lib/grub/x86_64-efi/mmap.module
+lib/grub/x86_64-efi/moddep.lst
+lib/grub/x86_64-efi/modinfo.sh
 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/msdospart.mod
+lib/grub/x86_64-efi/msdospart.module
+lib/grub/x86_64-efi/mul_test.mod
+lib/grub/x86_64-efi/mul_test.module
+lib/grub/x86_64-efi/multiboot.mod
+lib/grub/x86_64-efi/multiboot.module
+lib/grub/x86_64-efi/multiboot2.mod
+lib/grub/x86_64-efi/multiboot2.module
 lib/grub/x86_64-efi/nativedisk.mod
 lib/grub/x86_64-efi/nativedisk.module
+lib/grub/x86_64-efi/net.mod
+lib/grub/x86_64-efi/net.module
+lib/grub/x86_64-efi/newc.mod
+lib/grub/x86_64-efi/newc.module
+lib/grub/x86_64-efi/nilfs2.mod
+lib/grub/x86_64-efi/nilfs2.module
+lib/grub/x86_64-efi/normal.mod
+lib/grub/x86_64-efi/normal.module
+lib/grub/x86_64-efi/ntfs.mod
+lib/grub/x86_64-efi/ntfs.module
+lib/grub/x86_64-efi/ntfscomp.mod
+lib/grub/x86_64-efi/ntfscomp.module
+lib/grub/x86_64-efi/odc.mod
+lib/grub/x86_64-efi/odc.module
 lib/grub/x86_64-efi/offsetio.mod
 lib/grub/x86_64-efi/offsetio.module
+lib/grub/x86_64-efi/ohci.mod
+lib/grub/x86_64-efi/ohci.module
+lib/grub/x86_64-efi/part_acorn.mod
+lib/grub/x86_64-efi/part_acorn.module
+lib/grub/x86_64-efi/part_amiga.mod
+lib/grub/x86_64-efi/part_amiga.module
+lib/grub/x86_64-efi/part_apple.mod
+lib/grub/x86_64-efi/part_apple.module
+lib/grub/x86_64-efi/part_bsd.mod
+lib/grub/x86_64-efi/part_bsd.module
 lib/grub/x86_64-efi/part_dfly.mod
 lib/grub/x86_64-efi/part_dfly.module
+lib/grub/x86_64-efi/part_dvh.mod
+lib/grub/x86_64-efi/part_dvh.module
+lib/grub/x86_64-efi/part_gpt.mod
+lib/grub/x86_64-efi/part_gpt.module
+lib/grub/x86_64-efi/part_msdos.mod
+lib/grub/x86_64-efi/part_msdos.module
+lib/grub/x86_64-efi/part_plan.mod
+lib/grub/x86_64-efi/part_plan.module
+lib/grub/x86_64-efi/part_sun.mod
+lib/grub/x86_64-efi/part_sun.module
+lib/grub/x86_64-efi/part_sunpc.mod
+lib/grub/x86_64-efi/part_sunpc.module
+lib/grub/x86_64-efi/partmap.lst
+lib/grub/x86_64-efi/parttool.lst
+lib/grub/x86_64-efi/parttool.mod
+lib/grub/x86_64-efi/parttool.module
+lib/grub/x86_64-efi/password.mod
+lib/grub/x86_64-efi/password.module
+lib/grub/x86_64-efi/password_pbkdf2.mod
+lib/grub/x86_64-efi/password_pbkdf2.module
+lib/grub/x86_64-efi/pata.mod
+lib/grub/x86_64-efi/pata.module
+lib/grub/x86_64-efi/pbkdf2.mod
+lib/grub/x86_64-efi/pbkdf2.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/play.mod
+lib/grub/x86_64-efi/play.module
+lib/grub/x86_64-efi/png.mod
+lib/grub/x86_64-efi/png.module
+lib/grub/x86_64-efi/priority_queue.mod
+lib/grub/x86_64-efi/priority_queue.module
+lib/grub/x86_64-efi/probe.mod
+lib/grub/x86_64-efi/probe.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/raid5rec.mod
+lib/grub/x86_64-efi/raid5rec.module
+lib/grub/x86_64-efi/raid6rec.mod
+lib/grub/x86_64-efi/raid6rec.module
+lib/grub/x86_64-efi/read.mod
+lib/grub/x86_64-efi/read.module
+lib/grub/x86_64-efi/reboot.mod
+lib/grub/x86_64-efi/reboot.module
+lib/grub/x86_64-efi/regexp.mod
+lib/grub/x86_64-efi/regexp.module
+lib/grub/x86_64-efi/reiserfs.mod
+lib/grub/x86_64-efi/reiserfs.module
+lib/grub/x86_64-efi/relocator.mod
+lib/grub/x86_64-efi/relocator.module
+lib/grub/x86_64-efi/romfs.mod
+lib/grub/x86_64-efi/romfs.module
+lib/grub/x86_64-efi/scsi.mod
+lib/grub/x86_64-efi/scsi.module
+lib/grub/x86_64-efi/search.mod
+lib/grub/x86_64-efi/search.module
+lib/grub/x86_64-efi/search_fs_file.mod
+lib/grub/x86_64-efi/search_fs_file.module
+lib/grub/x86_64-efi/search_fs_uuid.mod
+lib/grub/x86_64-efi/search_fs_uuid.module
+lib/grub/x86_64-efi/search_label.mod
+lib/grub/x86_64-efi/search_label.module
+lib/grub/x86_64-efi/serial.mod
+lib/grub/x86_64-efi/serial.module
+lib/grub/x86_64-efi/setjmp.mod
+lib/grub/x86_64-efi/setjmp.module
 lib/grub/x86_64-efi/setjmp_test.mod
 lib/grub/x86_64-efi/setjmp_test.module
+lib/grub/x86_64-efi/setpci.mod
+lib/grub/x86_64-efi/setpci.module
+lib/grub/x86_64-efi/sfs.mod
+lib/grub/x86_64-efi/sfs.module
+lib/grub/x86_64-efi/shift_test.mod
+lib/grub/x86_64-efi/shift_test.module
 lib/grub/x86_64-efi/signature_test.mod
 lib/grub/x86_64-efi/signature_test.module
+lib/grub/x86_64-efi/sleep.mod
+lib/grub/x86_64-efi/sleep.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/squash4.mod
+lib/grub/x86_64-efi/squash4.module
 lib/grub/x86_64-efi/syslinuxcfg.mod
 lib/grub/x86_64-efi/syslinuxcfg.module
+lib/grub/x86_64-efi/tar.mod
+lib/grub/x86_64-efi/tar.module
+lib/grub/x86_64-efi/terminal.lst
+lib/grub/x86_64-efi/terminal.mod
+lib/grub/x86_64-efi/terminal.module
+lib/grub/x86_64-efi/terminfo.mod
+lib/grub/x86_64-efi/terminfo.module
+lib/grub/x86_64-efi/test.mod
+lib/grub/x86_64-efi/test.module
+lib/grub/x86_64-efi/test_blockarg.mod
+lib/grub/x86_64-efi/test_blockarg.module
+lib/grub/x86_64-efi/testload.mod
+lib/grub/x86_64-efi/testload.module
 lib/grub/x86_64-efi/testspeed.mod
 lib/grub/x86_64-efi/testspeed.module
+lib/grub/x86_64-efi/tftp.mod
+lib/grub/x86_64-efi/tftp.module
+lib/grub/x86_64-efi/tga.mod
+lib/grub/x86_64-efi/tga.module
+lib/grub/x86_64-efi/time.mod
+lib/grub/x86_64-efi/time.module
 lib/grub/x86_64-efi/tr.mod
 lib/grub/x86_64-efi/tr.module
+lib/grub/x86_64-efi/trig.mod
+lib/grub/x86_64-efi/trig.module
+lib/grub/x86_64-efi/true.mod
+lib/grub/x86_64-efi/true.module
+lib/grub/x86_64-efi/udf.mod
+lib/grub/x86_64-efi/udf.module
+lib/grub/x86_64-efi/ufs1.mod
+lib/grub/x86_64-efi/ufs1.module
 lib/grub/x86_64-efi/ufs1_be.mod
 lib/grub/x86_64-efi/ufs1_be.module
+lib/grub/x86_64-efi/ufs2.mod
+lib/grub/x86_64-efi/ufs2.module
+lib/grub/x86_64-efi/uhci.mod
+lib/grub/x86_64-efi/uhci.module
+lib/grub/x86_64-efi/usb.mod
+lib/grub/x86_64-efi/usb.module
+lib/grub/x86_64-efi/usb_keyboard.mod
+lib/grub/x86_64-efi/usb_keyboard.module
+lib/grub/x86_64-efi/usbms.mod
+lib/grub/x86_64-efi/usbms.module
+lib/grub/x86_64-efi/usbserial_common.mod
+lib/grub/x86_64-efi/usbserial_common.module
+lib/grub/x86_64-efi/usbserial_ftdi.mod
+lib/grub/x86_64-efi/usbserial_ftdi.module
+lib/grub/x86_64-efi/usbserial_pl2303.mod
+lib/grub/x86_64-efi/usbserial_pl2303.module
 lib/grub/x86_64-efi/usbserial_usbdebug.mod
 lib/grub/x86_64-efi/usbserial_usbdebug.module
+lib/grub/x86_64-efi/usbtest.mod
+lib/grub/x86_64-efi/usbtest.module
 lib/grub/x86_64-efi/verify.mod
 lib/grub/x86_64-efi/verify.module
+lib/grub/x86_64-efi/video.lst
+lib/grub/x86_64-efi/video.mod
+lib/grub/x86_64-efi/video.module
+lib/grub/x86_64-efi/video_bochs.mod
+lib/grub/x86_64-efi/video_bochs.module
+lib/grub/x86_64-efi/video_cirrus.mod
+lib/grub/x86_64-efi/video_cirrus.module
 lib/grub/x86_64-efi/video_colors.mod
 lib/grub/x86_64-efi/video_colors.module
+lib/grub/x86_64-efi/video_fb.mod
+lib/grub/x86_64-efi/video_fb.module
+lib/grub/x86_64-efi/videoinfo.mod
+lib/grub/x86_64-efi/videoinfo.module
+lib/grub/x86_64-efi/videotest.mod
+lib/grub/x86_64-efi/videotest.module
 lib/grub/x86_64-efi/videotest_checksum.mod
 lib/grub/x86_64-efi/videotest_checksum.module
+lib/grub/x86_64-efi/xfs.mod
+lib/grub/x86_64-efi/xfs.module
+lib/grub/x86_64-efi/xnu.mod
+lib/grub/x86_64-efi/xnu.module
+lib/grub/x86_64-efi/xnu_uuid.mod
+lib/grub/x86_64-efi/xnu_uuid.module
 lib/grub/x86_64-efi/xnu_uuid_test.mod
 lib/grub/x86_64-efi/xnu_uuid_test.module
+lib/grub/x86_64-efi/xzio.mod
+lib/grub/x86_64-efi/xzio.module
+lib/grub/x86_64-efi/zfs.mod
+lib/grub/x86_64-efi/zfs.module
+lib/grub/x86_64-efi/zfscrypt.mod
+lib/grub/x86_64-efi/zfscrypt.module
+lib/grub/x86_64-efi/zfsinfo.mod
+lib/grub/x86_64-efi/zfsinfo.module
author	Kris Moore <kmoore@FreeBSD.org>	2015-06-07 22:34:49 +0000
committer	Kris Moore <kmoore@FreeBSD.org>	2015-06-07 22:34:49 +0000
commit	7d456e01cfa7b6548a5a6415b8bc0bfa866bbaf0 (patch)
tree	86b260e4f3f385d32b22d0f57b5180bbf0308b8c /sysutils/grub2-efi
parent	12f393e711b323e3dc82be03649310c35e1705e8 (diff)
download	ports-7d456e01cfa7b6548a5a6415b8bc0bfa866bbaf0.tar.gz ports-7d456e01cfa7b6548a5a6415b8bc0bfa866bbaf0.zip