mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-12-01 08:49:52 +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>
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Thu, 10 May 2018 13:40:19 -0400
|
|
Subject: [PATCH] Fixup for newer compiler
|
|
|
|
---
|
|
grub-core/fs/btrfs.c | 2 +-
|
|
include/grub/gpt_partition.h | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
|
|
index ba99d04f8ed..9cd7f4bdf65 100644
|
|
--- a/grub-core/fs/btrfs.c
|
|
+++ b/grub-core/fs/btrfs.c
|
|
@@ -215,7 +215,7 @@ struct grub_btrfs_inode
|
|
grub_uint64_t size;
|
|
grub_uint8_t dummy2[0x70];
|
|
struct grub_btrfs_time mtime;
|
|
-} GRUB_PACKED;
|
|
+} GRUB_PACKED __attribute__ ((aligned(8)));
|
|
|
|
struct grub_btrfs_extent_data
|
|
{
|
|
diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h
|
|
index 7a93f43291c..8212697bf6b 100644
|
|
--- a/include/grub/gpt_partition.h
|
|
+++ b/include/grub/gpt_partition.h
|
|
@@ -76,7 +76,7 @@ struct grub_gpt_partentry
|
|
grub_uint64_t end;
|
|
grub_uint64_t attrib;
|
|
char name[72];
|
|
-} GRUB_PACKED;
|
|
+} GRUB_PACKED __attribute__ ((aligned(8)));
|
|
|
|
grub_err_t
|
|
grub_gpt_partition_map_iterate (grub_disk_t disk,
|