mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-10-19 02:05:42 +00:00
e1531466e1
This change updates grub to the 2.04 release. The new release changed how grub is built, so the bootstrap and bootstrap.conf files have to be added to the dist-git. Also, the gitignore file changed so it has to be updated. Since the patches have been forward ported to 2.04, there's no need for a logic to maintain a patch with the delta between the release and the grub master branch. So the release-to-master.patch is dropped and no longer is updated by the do-rebase script. Also since gnulib isn't part of the grub repository anymore and cloned by the boostrap tool, a gnulib tarball is included as other source file and copied before calling the bootstrap tool. That way grub can be built even in builders that only have access to the sources lookaside cache. Resolves: rhbz#1727279 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
72 lines
2.3 KiB
Diff
72 lines
2.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Thu, 1 Jun 2017 09:59:56 -0400
|
|
Subject: [PATCH] Add grub_efi_allocate_pool() and grub_efi_free_pool()
|
|
wrappers.
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
include/grub/efi/efi.h | 36 ++++++++++++++++++++++++++++++++----
|
|
1 file changed, 32 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
|
|
index 090c8621066..5e2b479daec 100644
|
|
--- a/include/grub/efi/efi.h
|
|
+++ b/include/grub/efi/efi.h
|
|
@@ -24,6 +24,10 @@
|
|
#include <grub/dl.h>
|
|
#include <grub/efi/api.h>
|
|
|
|
+/* Variables. */
|
|
+extern grub_efi_system_table_t *EXPORT_VAR(grub_efi_system_table);
|
|
+extern grub_efi_handle_t EXPORT_VAR(grub_efi_image_handle);
|
|
+
|
|
/* Functions. */
|
|
void *EXPORT_FUNC(grub_efi_locate_protocol) (grub_efi_guid_t *protocol,
|
|
void *registration);
|
|
@@ -60,6 +64,33 @@ EXPORT_FUNC(grub_efi_get_memory_map) (grub_efi_uintn_t *memory_map_size,
|
|
grub_efi_uintn_t *descriptor_size,
|
|
grub_efi_uint32_t *descriptor_version);
|
|
void grub_efi_memory_fini (void);
|
|
+
|
|
+static inline grub_efi_status_t
|
|
+__attribute__((__unused__))
|
|
+grub_efi_allocate_pool (grub_efi_memory_type_t pool_type,
|
|
+ grub_efi_uintn_t buffer_size,
|
|
+ void **buffer)
|
|
+{
|
|
+ grub_efi_boot_services_t *b;
|
|
+ grub_efi_status_t status;
|
|
+
|
|
+ b = grub_efi_system_table->boot_services;
|
|
+ status = efi_call_3 (b->allocate_pool, pool_type, buffer_size, buffer);
|
|
+ return status;
|
|
+}
|
|
+
|
|
+static inline grub_efi_status_t
|
|
+__attribute__((__unused__))
|
|
+grub_efi_free_pool (void *buffer)
|
|
+{
|
|
+ grub_efi_boot_services_t *b;
|
|
+ grub_efi_status_t status;
|
|
+
|
|
+ b = grub_efi_system_table->boot_services;
|
|
+ status = efi_call_1 (b->free_pool, buffer);
|
|
+ return status;
|
|
+}
|
|
+
|
|
grub_efi_loaded_image_t *EXPORT_FUNC(grub_efi_get_loaded_image) (grub_efi_handle_t image_handle);
|
|
void EXPORT_FUNC(grub_efi_print_device_path) (grub_efi_device_path_t *dp);
|
|
char *EXPORT_FUNC(grub_efi_get_filename) (grub_efi_device_path_t *dp);
|
|
@@ -109,10 +140,7 @@ void grub_efi_init (void);
|
|
void grub_efi_fini (void);
|
|
void grub_efi_set_prefix (void);
|
|
|
|
-/* Variables. */
|
|
-extern grub_efi_system_table_t *EXPORT_VAR(grub_efi_system_table);
|
|
-extern grub_efi_handle_t EXPORT_VAR(grub_efi_image_handle);
|
|
-
|
|
+/* More variables. */
|
|
extern int EXPORT_VAR(grub_efi_is_finished);
|
|
|
|
struct grub_net_card;
|