commit d7d2451ceb9ad08ad91f22da649dc0e775cc3313
author Edward Hyunkoo Jee <edjee@google.com> Tue Feb 13 15:53:05 2018 -0800
committer Edward Jee <edjee@google.com> Wed Mar 07 22:24:29 2018 +0000
tree c281672e5bd2f39ca60debaae9b0e7a749c5b348
parent aae64b719211650d2e78b3ca2a093e7be479cb24

grub-lakitu: CHROMIUM: fix build

Fix compile errors caused by the conflicts between Redhat's UEFI
secure boot patches and Grub2 upstream's 'phcoder/verifiers' branch.

BUG=b:69569602
TEST=TBD

Change-Id: I9253e52fed5c6a13895b63de3c659f27bd76df7a
Reviewed-on: https://chromium-review.googlesource.com/945885
Reviewed-by: Edward Jee <edjee@google.com>
Commit-Queue: Edward Jee <edjee@google.com>
Tested-by: Edward Jee <edjee@google.com>
Trybot-Ready: Edward Jee <edjee@google.com>

grub-lakitu/grub-core/loader/i386/efi/linux.c

diff --git a/grub-lakitu/grub-core/loader/i386/efi/linux.c b/grub-lakitu/grub-core/loader/i386/efi/linux.c
index 6afa13d..a070eb0 100644
--- a/grub-lakitu/grub-core/loader/i386/efi/linux.c
+++ b/grub-lakitu/grub-core/loader/i386/efi/linux.c
@@ -131,8 +131,8 @@
 
   for (i = 0; i < argc; i++)
     {
-      grub_file_filter_disable_compression ();
-      files[i] = grub_file_open (argv[i]);
+      files[i] = grub_file_open (argv[i], GRUB_FILE_TYPE_LINUX_INITRD
+                                 | GRUB_FILE_TYPE_NO_DECOMPRESS);
       if (! files[i])
         goto fail;
       nfiles++;
@@ -197,7 +197,7 @@
       goto fail;
     }
 
-  file = grub_file_open (argv[0]);
+  file = grub_file_open (argv[0], GRUB_FILE_TYPE_LINUX_KERNEL);
   if (! file)
     goto fail;
 
@@ -282,7 +282,8 @@
   grub_memcpy (linux_cmdline, LINUX_IMAGE, sizeof (LINUX_IMAGE));
   grub_create_loader_cmdline (argc, argv,
                               linux_cmdline + sizeof (LINUX_IMAGE) - 1,
-			      lh.cmdline_size - (sizeof (LINUX_IMAGE) - 1));
+			      lh.cmdline_size - (sizeof (LINUX_IMAGE) - 1),
+                              GRUB_VERIFY_KERNEL_CMDLINE);
 
   lh.cmd_line_ptr = (grub_uint32_t)(grub_uint64_t)linux_cmdline;