mirror of
https://github.com/xcat2/xcat-dep.git
synced 2026-10-01 08:22:00 +00:00
Daniel Hilst
19c65dbec5
syslinux 3.86: add GCC 10+ -fcommon, GCC 15 -Wno-error flags, glibc sysmacros.h include, vpd.c pointer fix, python2 menugen skip. elilo-xcat: three patches for GCC 15 (bool keyword, StrnCpy conflict with gnu-efi 4.0) and binutils 2.46 (objcopy efi-app format removed). Bump debhelper compat 5→10, fix changelog maintainer emails. grub2-xcat: bump DH_COMPAT 5→8, add make_deb.sh.
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
--- elilo.orig/elilo.c 2026-05-19 14:49:25.504833083 +0000
|
|
+++ elilo/elilo.c 2026-05-19 14:49:30.174044609 +0000
|
|
@@ -405,15 +405,15 @@
|
|
{
|
|
EFI_STATUS status;
|
|
UINTN l = sizeof(BOOLEAN);
|
|
- UINT8 bool = FALSE;
|
|
+ UINT8 edd_bool = FALSE;
|
|
INTN ret = -1;
|
|
|
|
- status = uefi_call_wrapper(RT->GetVariable, 5, L"EDD30", &edd30_guid, NULL, &l, &bool);
|
|
- if (status == EFI_BUFFER_TOO_SMALL || (bool != TRUE && bool != FALSE)) {
|
|
+ status = uefi_call_wrapper(RT->GetVariable, 5, L"EDD30", &edd30_guid, NULL, &l, &edd_bool);
|
|
+ if (status == EFI_BUFFER_TOO_SMALL || (edd_bool != TRUE && edd_bool != FALSE)) {
|
|
ERR_PRT((L"Warning: EDD30 EFI variable is not boolean value: forcing it to TRUE"));
|
|
return -1;
|
|
}
|
|
- if (status == EFI_SUCCESS && bool == TRUE) {
|
|
+ if (status == EFI_SUCCESS && edd_bool == TRUE) {
|
|
VERB_PRT(3, Print(L"EDD30 is TRUE\n"));
|
|
elilo_opt.edd30_on = TRUE;
|
|
ret = 0;
|
|
@@ -435,10 +435,10 @@
|
|
{
|
|
EFI_STATUS status;
|
|
UINTN l = sizeof(BOOLEAN);
|
|
- UINT8 bool;
|
|
+ UINT8 edd_bool;
|
|
|
|
- bool = TRUE;
|
|
- status = uefi_call_wrapper(RT->SetVariable, 5, L"EDD30", &edd30_guid, EDD30_ATTR, l, &bool);
|
|
+ edd_bool = TRUE;
|
|
+ status = uefi_call_wrapper(RT->SetVariable, 5, L"EDD30", &edd30_guid, EDD30_ATTR, l, &edd_bool);
|
|
if (EFI_ERROR(status)) {
|
|
ERR_PRT((L"can't set EDD30 variable: ignoring it"));
|
|
return -1;
|