diff options
| author | Oskari Rauta <oskari.rauta@gmail.com> | 2023-11-18 12:03:38 +0200 |
|---|---|---|
| committer | Tianling Shen <cnsztl@gmail.com> | 2023-11-19 13:29:27 +0800 |
| commit | 339360045328a3338c08dfe39e6105dac886bf4f (patch) | |
| tree | 1f6eb73f909bcb0f9981977b5720826938000467 /utils/gummiboot | |
| parent | 7b3d033ab651dd11e0db5fb099d106c9e09a2dc6 (diff) | |
gummiboot: release bump
Changes:
- fixes conflicts with EFI headers mentioned in issue #22433
Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
Diffstat (limited to 'utils/gummiboot')
| -rw-r--r-- | utils/gummiboot/Makefile | 2 | ||||
| -rw-r--r-- | utils/gummiboot/patches/030-fix-efi-conflicts.patch | 66 |
2 files changed, 67 insertions, 1 deletions
diff --git a/utils/gummiboot/Makefile b/utils/gummiboot/Makefile index b1e6d052e..688764e43 100644 --- a/utils/gummiboot/Makefile +++ b/utils/gummiboot/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gummiboot PKG_VERSION:=48.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://dev.alpinelinux.org/archive/gummiboot/ diff --git a/utils/gummiboot/patches/030-fix-efi-conflicts.patch b/utils/gummiboot/patches/030-fix-efi-conflicts.patch new file mode 100644 index 000000000..51b28d473 --- /dev/null +++ b/utils/gummiboot/patches/030-fix-efi-conflicts.patch @@ -0,0 +1,66 @@ +--- a/src/efi/console.c ++++ b/src/efi/console.c +@@ -21,63 +21,10 @@ + #include "util.h" + #include "console.h" + +-#define EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID \ +- { 0xdd9e7534, 0x7762, 0x4698, { 0x8c, 0x14, 0xf5, 0x85, 0x17, 0xa6, 0x25, 0xaa } } +- + struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL; + +-typedef EFI_STATUS (EFIAPI *EFI_INPUT_RESET_EX)( +- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This; +- BOOLEAN ExtendedVerification; +-); +- + typedef UINT8 EFI_KEY_TOGGLE_STATE; + +-typedef struct { +- UINT32 KeyShiftState; +- EFI_KEY_TOGGLE_STATE KeyToggleState; +-} EFI_KEY_STATE; +- +-typedef struct { +- EFI_INPUT_KEY Key; +- EFI_KEY_STATE KeyState; +-} EFI_KEY_DATA; +- +-typedef EFI_STATUS (EFIAPI *EFI_INPUT_READ_KEY_EX)( +- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This; +- EFI_KEY_DATA *KeyData; +-); +- +-typedef EFI_STATUS (EFIAPI *EFI_SET_STATE)( +- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This; +- EFI_KEY_TOGGLE_STATE *KeyToggleState; +-); +- +-typedef EFI_STATUS (EFIAPI *EFI_KEY_NOTIFY_FUNCTION)( +- EFI_KEY_DATA *KeyData; +-); +- +-typedef EFI_STATUS (EFIAPI *EFI_REGISTER_KEYSTROKE_NOTIFY)( +- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This; +- EFI_KEY_DATA KeyData; +- EFI_KEY_NOTIFY_FUNCTION KeyNotificationFunction; +- VOID **NotifyHandle; +-); +- +-typedef EFI_STATUS (EFIAPI *EFI_UNREGISTER_KEYSTROKE_NOTIFY)( +- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This; +- VOID *NotificationHandle; +-); +- +-typedef struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL { +- EFI_INPUT_RESET_EX Reset; +- EFI_INPUT_READ_KEY_EX ReadKeyStrokeEx; +- EFI_EVENT WaitForKeyEx; +- EFI_SET_STATE SetState; +- EFI_REGISTER_KEYSTROKE_NOTIFY RegisterKeyNotify; +- EFI_UNREGISTER_KEYSTROKE_NOTIFY UnregisterKeyNotify; +-} EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL; +- + EFI_STATUS console_key_read(UINT64 *key, BOOLEAN wait) { + EFI_GUID EfiSimpleTextInputExProtocolGuid = EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID; + static EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *TextInputEx; |