From 32a9410d7e6d859b702b519480faccac423a61b7 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Tue, 28 Aug 2018 15:46:47 +0200
Subject: [PATCH 1/6] grub: Securely download source archive over HTTPS

---
 grub.be0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grub.be0 b/grub.be0
index 429e72754..980aa25c7 100755
--- a/grub.be0
+++ b/grub.be0
@@ -2,7 +2,7 @@
 
 # BEE_VERSION grub-2.02-0
 
-SRCURL[0]="ftp://ftp.gnu.org/gnu/grub/grub-${PKGVERSION}.tar.gz"
+SRCURL[0]="https://ftp.gnu.org/gnu/grub/grub-${PKGVERSION}.tar.gz"
 
 #PATCHURL+=(/src/mariux/patches/grub-2.00-0001-avoid-compile-error-due-to-undeclared-gets.patch)
 

From 807eb02d1950809ed298f9142e064145f5bcd418 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Tue, 28 Aug 2018 15:47:03 +0200
Subject: [PATCH 2/6] grub: Build outside the source directory

---
 grub.be0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grub.be0 b/grub.be0
index 980aa25c7..8cd196221 100755
--- a/grub.be0
+++ b/grub.be0
@@ -8,7 +8,7 @@ SRCURL[0]="https://ftp.gnu.org/gnu/grub/grub-${PKGVERSION}.tar.gz"
 
 # EXCLUDE+=()
 
-build_in_sourcedir
+# build_in_sourcedir
 
 # sourcesubdir_append src
 

From af898af435a350bfb0c4709cdd8b5e12b027e64a Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Tue, 28 Aug 2018 18:49:05 +0200
Subject: [PATCH 3/6] grub: Remove path to patch in comment
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It’s all in the git history.
---
 grub.be0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grub.be0 b/grub.be0
index 8cd196221..d12929daf 100755
--- a/grub.be0
+++ b/grub.be0
@@ -4,7 +4,7 @@
 
 SRCURL[0]="https://ftp.gnu.org/gnu/grub/grub-${PKGVERSION}.tar.gz"
 
-#PATCHURL+=(/src/mariux/patches/grub-2.00-0001-avoid-compile-error-due-to-undeclared-gets.patch)
+# PATCHURL+=()
 
 # EXCLUDE+=()
 

From a1624c48838de8dc9110b9a0591c6396643a54f7 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Tue, 28 Aug 2018 16:25:08 +0200
Subject: [PATCH 4/6] grub: Build GRUB

Newer systems, like the Dell OptiPlex 5055 with Ryzen CPU and firmware
version 1.1.10 and 1.1.15, have problems with legacy boot. Therefore,
also build GRUB for x86_64-efi.

Abuse, `mee_install_post()` to build GRUB for EFI after the first `make
install`.
---
 grub.be0 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/grub.be0 b/grub.be0
index d12929daf..b8280e8fb 100755
--- a/grub.be0
+++ b/grub.be0
@@ -33,3 +33,13 @@ SRCURL[0]="https://ftp.gnu.org/gnu/grub/grub-${PKGVERSION}.tar.gz"
 #    bee_install
 #}
 ## by default this may be 'make install DESTDIR="${D}"'
+
+# Install x86_64-efi
+mee_install_post() {
+    start_cmd make clean
+    bee_configure \
+        --with-platform=efi \
+        --target=x86_64
+    bee_build
+    bee_install
+}

From 9ff2a1ad9dab08e72e147e68d5d7e2ae5f5a81b4 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Tue, 28 Aug 2018 15:48:13 +0200
Subject: [PATCH 5/6] grub: Increment revision to 1

---
 grub.be0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grub.be0 b/grub.be0
index b8280e8fb..f5c76d3d6 100755
--- a/grub.be0
+++ b/grub.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION grub-2.02-0
+# BEE_VERSION grub-2.02-1
 
 SRCURL[0]="https://ftp.gnu.org/gnu/grub/grub-${PKGVERSION}.tar.gz"
 

From d2c7e4ab7b31cdb83b92590a42072993591ac100 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Wed, 29 Aug 2018 16:03:34 +0200
Subject: [PATCH 6/6] grub: Update to git version

---
 grub.be0 | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/grub.be0 b/grub.be0
index f5c76d3d6..3dc175212 100755
--- a/grub.be0
+++ b/grub.be0
@@ -1,8 +1,8 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION grub-2.02-1
+# BEE_VERSION grub-2.02_p167_61ec2e300-0
 
-SRCURL[0]="https://ftp.gnu.org/gnu/grub/grub-${PKGVERSION}.tar.gz"
+SRCURL[0]="/src/mariux/beeroot/downloads/grub-${PKGVERSION}_p167_61ec2e300.tar.bz2"
 
 # PATCHURL+=()
 
@@ -17,9 +17,10 @@ SRCURL[0]="https://ftp.gnu.org/gnu/grub/grub-${PKGVERSION}.tar.gz"
 #    bee_extract "${@}"
 #}
 
-#mee_patch() {
-#    bee_patch "${@}"
-#}
+mee_patch() {
+    bee_patch "${@}"
+    ./autogen.sh
+}
 
 #mee_configure() {
 #    bee_configure