disk/grub2: version 2.04

4 files changed, 6 insertions, 80 deletions

diff --git a/disk/grub2/DETAILS b/disk/grub2/DETAILS
index 137500e4eb..d003840281 100755
--- a/disk/grub2/DETAILS
+++ b/disk/grub2/DETAILS
@@ -7,7 +7,7 @@ case "$GRUB2_RELEASE" in
      SOURCE_HASH=sha512:1521b5c35e43b38bb7a1257b090ed73e47fbdf2de83e2088eaecc81d944a8bb94d5feca8e429d86948b7369ddc2b0521a3d2991a985dcdeb11a0c79150714ee9
   ;;
   stable|*)
-         VERSION=2.02
+         VERSION=2.04
           SOURCE=grub-$VERSION.tar.xz
    SOURCE_URL[0]=${GNU_URL}/grub/$SOURCE
          SOURCE2=grub-$VERSION.tar.xz.sig
diff --git a/disk/grub2/HISTORY b/disk/grub2/HISTORY
index acd342ba3f..a2e59ec9a5 100644
--- a/disk/grub2/HISTORY
+++ b/disk/grub2/HISTORY
@@ -1,3 +1,7 @@
+2019-07-05 Pavel Vinogradov <public@sourcemage.org>
+	* DETAILS: version 2.04
+	* PRE_BUILD, gcc-8.patch: removed the patch
+
 2019-05-24 Ismael Luceno <ismael@sourcemage.org>
 	* DEPENDS: Updated dependency; s/gettext/GETTEXT/
 
@@ -7,7 +11,7 @@
 	* INSTALL: install smgl-splash.png
 	
 2019-01-19  Treeve Jelbert <treeve@sourcemage.org>
- 	* DEPENDS: delete gnupg
+	* DEPENDS: delete gnupg
 
 2018-09-13 Eric Sandall <sandalle@sourcemage.org>
 	* PRE_BUILD: Apply gcc-8.patch
diff --git a/disk/grub2/PRE_BUILD b/disk/grub2/PRE_BUILD
index bf59012ca5..fcfd0db539 100755
--- a/disk/grub2/PRE_BUILD
+++ b/disk/grub2/PRE_BUILD
@@ -1,9 +1,6 @@
 default_pre_build &&
 cd "${SOURCE_DIRECTORY}" &&
 
-message "${MESSAGE_COLOR}Applying GCC 8.x patch...${DEFAULT_COLOR}" &&
-patch -p1 < "${SPELL_DIRECTORY}"/gcc-8.patch  &&
-
 if [[ "$GRUB2_RELEASE" != "stable" ]]; then
   ./autogen.sh
 fi
diff --git a/disk/grub2/gcc-8.patch b/disk/grub2/gcc-8.patch
deleted file mode 100644
index b45d614ad3..0000000000
--- a/disk/grub2/gcc-8.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-# From https://patchwork.openembedded.org/patch/150595/
-From 563b1da6e6ae7af46cc8354cadb5dab416989f0a Mon Sep 17 00:00:00 2001
-From: Michael Chang <mchang@suse.com>
-Date: Mon, 26 Mar 2018 16:52:34 +0800
-Subject: Fix packed-not-aligned error on GCC 8
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When building with GCC 8, there are several errors regarding packed-not-aligned.
-
-./include/grub/gpt_partition.h:79:1: error: alignment 1 of ‘struct grub_gpt_partentry’ is less than 8 [-Werror=packed-not-aligned]
-
-This patch fixes the build error by cleaning up the ambiguity of placing
-aligned structure in a packed one. In "struct grub_btrfs_time" and "struct
-grub_gpt_part_type", the aligned attribute seems to be superfluous, and also
-has to be packed, to ensure the structure is bit-to-bit mapped to the format
-laid on disk. I think we could blame to copy and paste error here for the
-mistake. In "struct efi_variable", we have to use grub_efi_packed_guid_t, as
-the name suggests. :)
-
-Signed-off-by: Michael Chang <mchang@suse.com>
-Tested-by: Michael Chang <mchang@suse.com>
-Tested-by: Paul Menzel <paulepanter@users.sourceforge.net>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-
-Upstream-Status: Backport http://git.savannah.gnu.org/cgit/grub.git/commit/?id=563b1da6e6ae7af46cc8354cadb5dab416989f0a
----
- grub-core/fs/btrfs.c          | 2 +-
- include/grub/efiemu/runtime.h | 2 +-
- include/grub/gpt_partition.h  | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 4849c1c..be19544 100644
---- a/grub-core/fs/btrfs.c
-+++ b/grub-core/fs/btrfs.c
-@@ -175,7 +175,7 @@ struct grub_btrfs_time
- {
-   grub_int64_t sec;
-   grub_uint32_t nanosec;
--} __attribute__ ((aligned (4)));
-+} GRUB_PACKED;
- 
- struct grub_btrfs_inode
- {
-diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h
-index 9b6b729..36d2ded 100644
---- a/include/grub/efiemu/runtime.h
-+++ b/include/grub/efiemu/runtime.h
-@@ -29,7 +29,7 @@ struct grub_efiemu_ptv_rel
- 
- struct efi_variable
- {
--  grub_efi_guid_t guid;
-+  grub_efi_packed_guid_t guid;
-   grub_uint32_t namelen;
-   grub_uint32_t size;
-   grub_efi_uint32_t attributes;
-diff --git a/include/grub/gpt_partition.h b/include/grub/gpt_partition.h
-index 1b32f67..9668a68 100644
---- a/include/grub/gpt_partition.h
-+++ b/include/grub/gpt_partition.h
-@@ -28,7 +28,7 @@ struct grub_gpt_part_type
-   grub_uint16_t data2;
-   grub_uint16_t data3;
-   grub_uint8_t data4[8];
--} __attribute__ ((aligned(8)));
-+} GRUB_PACKED;
- typedef struct grub_gpt_part_type grub_gpt_part_type_t;
- 
- #define GRUB_GPT_PARTITION_TYPE_EMPTY \
--- 
-cgit v1.0-41-gc330
-