diff options
Diffstat (limited to 'source/a')
| -rw-r--r-- | source/a/FTBFSlog | 4 | ||||
| -rw-r--r-- | source/a/grub/0198-align-struct-efi_variable-better.patch | 36 | ||||
| -rwxr-xr-x | source/a/grub/grub.SlackBuild | 3 |
3 files changed, 43 insertions, 0 deletions
diff --git a/source/a/FTBFSlog b/source/a/FTBFSlog index 77094315b..46b928237 100644 --- a/source/a/FTBFSlog +++ b/source/a/FTBFSlog @@ -1,3 +1,7 @@ +Tue Jun 26 09:45:32 UTC 2018 + grub: fix FTBFS with gcc8 by patching to fix this warning: + alignment 1 of struct efi_variable is less than 8 [-Werror=packed-not-aligned] ++--------------------------+ Tue Mar 13 18:42:23 UTC 2018 btrfs-progs: patched to build with latest e2fsprogs. Thanks to nobodino. +--------------------------+ diff --git a/source/a/grub/0198-align-struct-efi_variable-better.patch b/source/a/grub/0198-align-struct-efi_variable-better.patch new file mode 100644 index 000000000..8ce8bdc82 --- /dev/null +++ b/source/a/grub/0198-align-struct-efi_variable-better.patch @@ -0,0 +1,36 @@ +From 2485633ada06c11c07a34a696a92b14e58f1e846 Mon Sep 17 00:00:00 2001 +From: Peter Jones <pjones@redhat.com> +Date: Tue, 27 Feb 2018 13:55:35 -0500 +Subject: [PATCH 198/250] align struct efi_variable better... + +--- + include/grub/efiemu/runtime.h | 2 +- + include/grub/types.h | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h +index 9b6b729f4cc..856774a7c34 100644 +--- a/include/grub/efiemu/runtime.h ++++ b/include/grub/efiemu/runtime.h +@@ -33,5 +33,5 @@ struct efi_variable + grub_uint32_t namelen; + grub_uint32_t size; + grub_efi_uint32_t attributes; +-} GRUB_PACKED; ++} GRUB_PACKED GRUB_ALIGNED(8); + #endif /* ! GRUB_EFI_EMU_RUNTIME_HEADER */ +diff --git a/include/grub/types.h b/include/grub/types.h +index b93e4820194..f6a9723971d 100644 +--- a/include/grub/types.h ++++ b/include/grub/types.h +@@ -29,6 +29,7 @@ + #else + #define GRUB_PACKED __attribute__ ((packed)) + #endif ++#define GRUB_ALIGNED(x) __attribute__((aligned (x))) + + #ifdef GRUB_BUILD + # define GRUB_CPU_SIZEOF_VOID_P BUILD_SIZEOF_VOID_P +-- +2.14.3 + diff --git a/source/a/grub/grub.SlackBuild b/source/a/grub/grub.SlackBuild index 5bd18cdb7..26b8e51e6 100755 --- a/source/a/grub/grub.SlackBuild +++ b/source/a/grub/grub.SlackBuild @@ -109,6 +109,9 @@ zcat $CWD/grub.dejavusansmono.gfxterm.font.diff.gz | patch -p1 --verbose || exit # Fix security issue when reading username and password: zcat $CWD/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch.gz | patch -p1 --verbose || exit 1 +# Fix alignment error with gcc8: +zcat $CWD/0198-align-struct-efi_variable-better.patch.gz | patch -p1 --verbose || exit 1 + build_grub() { EFI_DO="$*" # Configure: |