75 lines
2.7 KiB
Diff
75 lines
2.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Leif Lindholm <leif.lindholm@linaro.org>
|
||
|
|
Date: Wed, 14 Nov 2018 19:29:19 +0000
|
||
|
|
Subject: [PATCH] arm-uboot, ia64, sparc64: Fix up grub_file_open() calls
|
||
|
|
|
||
|
|
The verifiers framework changed the grub_file_open() interface, breaking all
|
||
|
|
non-x86 linux loaders. Add file types to the grub_file_open() calls to make
|
||
|
|
them build again.
|
||
|
|
|
||
|
|
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
|
||
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
||
|
|
---
|
||
|
|
grub-core/loader/arm/linux.c | 6 +++---
|
||
|
|
grub-core/loader/ia64/efi/linux.c | 2 +-
|
||
|
|
grub-core/loader/sparc64/ieee1275/linux.c | 2 +-
|
||
|
|
3 files changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c
|
||
|
|
index beceda52030..1e944a2b671 100644
|
||
|
|
--- a/grub-core/loader/arm/linux.c
|
||
|
|
+++ b/grub-core/loader/arm/linux.c
|
||
|
|
@@ -363,7 +363,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||
|
|
if (argc == 0)
|
||
|
|
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
|
||
|
|
|
||
|
|
- file = grub_file_open (argv[0]);
|
||
|
|
+ file = grub_file_open (argv[0], GRUB_FILE_TYPE_LINUX_KERNEL);
|
||
|
|
if (!file)
|
||
|
|
goto fail;
|
||
|
|
|
||
|
|
@@ -408,7 +408,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
|
||
|
|
if (argc == 0)
|
||
|
|
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
|
||
|
|
|
||
|
|
- file = grub_file_open (argv[0]);
|
||
|
|
+ file = grub_file_open (argv[0], GRUB_FILE_TYPE_LINUX_INITRD);
|
||
|
|
if (!file)
|
||
|
|
return grub_errno;
|
||
|
|
|
||
|
|
@@ -471,7 +471,7 @@ grub_cmd_devicetree (grub_command_t cmd __attribute__ ((unused)),
|
||
|
|
if (argc != 1)
|
||
|
|
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
|
||
|
|
|
||
|
|
- dtb = grub_file_open (argv[0]);
|
||
|
|
+ dtb = grub_file_open (argv[0], GRUB_FILE_TYPE_DEVICE_TREE_IMAGE);
|
||
|
|
if (!dtb)
|
||
|
|
return grub_errno;
|
||
|
|
|
||
|
|
diff --git a/grub-core/loader/ia64/efi/linux.c b/grub-core/loader/ia64/efi/linux.c
|
||
|
|
index e325fe0ee83..2ad0b0c0407 100644
|
||
|
|
--- a/grub-core/loader/ia64/efi/linux.c
|
||
|
|
+++ b/grub-core/loader/ia64/efi/linux.c
|
||
|
|
@@ -502,7 +502,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||
|
|
goto fail;
|
||
|
|
}
|
||
|
|
|
||
|
|
- file = grub_file_open (argv[0]);
|
||
|
|
+ file = grub_file_open (argv[0], GRUB_FILE_TYPE_LINUX_KERNEL);
|
||
|
|
if (! file)
|
||
|
|
goto fail;
|
||
|
|
|
||
|
|
diff --git a/grub-core/loader/sparc64/ieee1275/linux.c b/grub-core/loader/sparc64/ieee1275/linux.c
|
||
|
|
index abe46faa012..bb47ee0cc64 100644
|
||
|
|
--- a/grub-core/loader/sparc64/ieee1275/linux.c
|
||
|
|
+++ b/grub-core/loader/sparc64/ieee1275/linux.c
|
||
|
|
@@ -306,7 +306,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||
|
|
goto out;
|
||
|
|
}
|
||
|
|
|
||
|
|
- file = grub_file_open (argv[0]);
|
||
|
|
+ file = grub_file_open (argv[0], GRUB_FILE_TYPE_LINUX_KERNEL);
|
||
|
|
if (!file)
|
||
|
|
goto out;
|
||
|
|
|