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>
87 lines
2.4 KiB
Diff
87 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Wed, 6 Jun 2018 16:47:11 +0200
|
|
Subject: [PATCH] Make grub_getkeystatus helper funtion available everywhere
|
|
|
|
Move the grub_getkeystatus helper function from
|
|
grub-core/commands/keystatus.c to grub-core/kern/term.c
|
|
and export it so that it can be used outside of the
|
|
keystatus command code too.
|
|
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
---
|
|
grub-core/commands/keystatus.c | 18 ------------------
|
|
grub-core/kern/term.c | 18 ++++++++++++++++++
|
|
include/grub/term.h | 1 +
|
|
3 files changed, 19 insertions(+), 18 deletions(-)
|
|
|
|
diff --git a/grub-core/commands/keystatus.c b/grub-core/commands/keystatus.c
|
|
index 460cf4e7e50..ff3f5878163 100644
|
|
--- a/grub-core/commands/keystatus.c
|
|
+++ b/grub-core/commands/keystatus.c
|
|
@@ -35,24 +35,6 @@ static const struct grub_arg_option options[] =
|
|
{0, 0, 0, 0, 0, 0}
|
|
};
|
|
|
|
-static int
|
|
-grub_getkeystatus (void)
|
|
-{
|
|
- int status = 0;
|
|
- grub_term_input_t term;
|
|
-
|
|
- if (grub_term_poll_usb)
|
|
- grub_term_poll_usb (0);
|
|
-
|
|
- FOR_ACTIVE_TERM_INPUTS(term)
|
|
- {
|
|
- if (term->getkeystatus)
|
|
- status |= term->getkeystatus (term);
|
|
- }
|
|
-
|
|
- return status;
|
|
-}
|
|
-
|
|
static grub_err_t
|
|
grub_cmd_keystatus (grub_extcmd_context_t ctxt,
|
|
int argc __attribute__ ((unused)),
|
|
diff --git a/grub-core/kern/term.c b/grub-core/kern/term.c
|
|
index 07720ee6746..93bd3378d18 100644
|
|
--- a/grub-core/kern/term.c
|
|
+++ b/grub-core/kern/term.c
|
|
@@ -120,6 +120,24 @@ grub_getkey (void)
|
|
}
|
|
}
|
|
|
|
+int
|
|
+grub_getkeystatus (void)
|
|
+{
|
|
+ int status = 0;
|
|
+ grub_term_input_t term;
|
|
+
|
|
+ if (grub_term_poll_usb)
|
|
+ grub_term_poll_usb (0);
|
|
+
|
|
+ FOR_ACTIVE_TERM_INPUTS(term)
|
|
+ {
|
|
+ if (term->getkeystatus)
|
|
+ status |= term->getkeystatus (term);
|
|
+ }
|
|
+
|
|
+ return status;
|
|
+}
|
|
+
|
|
void
|
|
grub_refresh (void)
|
|
{
|
|
diff --git a/include/grub/term.h b/include/grub/term.h
|
|
index 8117e2a24da..c215133383f 100644
|
|
--- a/include/grub/term.h
|
|
+++ b/include/grub/term.h
|
|
@@ -327,6 +327,7 @@ grub_term_unregister_output (grub_term_output_t term)
|
|
void grub_putcode (grub_uint32_t code, struct grub_term_output *term);
|
|
int EXPORT_FUNC(grub_getkey) (void);
|
|
int EXPORT_FUNC(grub_getkey_noblock) (void);
|
|
+int EXPORT_FUNC(grub_getkeystatus) (void);
|
|
void grub_cls (void);
|
|
void EXPORT_FUNC(grub_refresh) (void);
|
|
void grub_puts_terminal (const char *str, struct grub_term_output *term);
|