Update patches and remove unnecessary workaround.

5 files changed, 46 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0fe651eb6860..556149049108 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = grub-git
 	pkgdesc = GNU GRand Unified Bootloader (2)
-	pkgver = 2.04.rc1.r19.g4e7b5bb3b
+	pkgver = 2.06.rc1.r0.ga53e530f8
 	pkgrel = 1
 	url = https://www.gnu.org/software/grub/
 	install = grub-git.install
@@ -34,15 +34,15 @@ pkgbase = grub-git
 	source = grub::git+https://git.savannah.gnu.org/git/grub.git
 	source = grub-extras::git+https://git.savannah.gnu.org/git/grub-extras.git
 	source = gnulib::git+https://git.savannah.gnu.org/git/gnulib.git
-	source = 10_linux-detect-archlinux-initramfs.patch
 	source = add-GRUB_COLOR_variables.patch
+	source = detect-archlinux-initramfs.patch
 	source = grub.default
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 171415ab075d1ac806f36c454feeb060f870416f24279b70104bba94bd6076d4
-	sha256sums = a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29
-	sha256sums = 690adb7943ee9fedff578a9d482233925ca3ad3e5a50fffddd27cf33300a89e3
+	sha256sums = 5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab
+	sha256sums = 580a81b00088773d554832b0d74c85bf16fec37728802973c45993bcb97cd7d5
+	sha256sums = 791fadf182edf8d5bee4b45c008b08adce9689a9624971136527891a8f67d206
 
 pkgname = grub-git
 
diff --git a/PKGBUILD b/PKGBUILD
index d0f6ad20f35c..ddc8e9fc6787 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@ _build_platforms="i386-pc ${_target_arch}-efi"
 [[ "${_grub_emu_build}" == "1" ]] && _build_platforms+=" ${_target_arch}-emu"
 
 pkgname="grub-git"
-pkgver=2.04.rc1.r19.g4e7b5bb3b
+pkgver=2.06.rc1.r0.ga53e530f8
 pkgrel=1
 pkgdesc="GNU GRand Unified Bootloader (2)"
 arch=('x86_64' 'i686')
@@ -46,26 +46,26 @@ install="${pkgname}.install"
 source=("grub::git+https://git.savannah.gnu.org/git/grub.git"
         "grub-extras::git+https://git.savannah.gnu.org/git/grub-extras.git"
         "gnulib::git+https://git.savannah.gnu.org/git/gnulib.git"
-        '10_linux-detect-archlinux-initramfs.patch'
         'add-GRUB_COLOR_variables.patch'
+        'detect-archlinux-initramfs.patch'
         'grub.default')
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
-            '171415ab075d1ac806f36c454feeb060f870416f24279b70104bba94bd6076d4'
-            'a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29'
-            '690adb7943ee9fedff578a9d482233925ca3ad3e5a50fffddd27cf33300a89e3')
+            '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab'
+            '580a81b00088773d554832b0d74c85bf16fec37728802973c45993bcb97cd7d5'
+            '791fadf182edf8d5bee4b45c008b08adce9689a9624971136527891a8f67d206')
  
 prepare() {
     cd grub
 
-    # Patch grub-mkconfig to detect Arch Linux initramfs images.
-    patch -Np1 -i "$srcdir"/10_linux-detect-archlinux-initramfs.patch
-
     # Patch to enable GRUB_COLOR_* variables in grub-mkconfig.
     # Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html
     patch -Np1 -i "$srcdir"/add-GRUB_COLOR_variables.patch
 
+    # Patch grub-mkconfig to detect Arch Linux initramfs images.
+    patch -Np1 -i "$srcdir"/detect-archlinux-initramfs.patch
+
     # Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme.
     sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac"
 
@@ -93,9 +93,6 @@ build() {
     export GRUB_CONTRIB="$srcdir"/grub-extras
     export GNULIB_SRCDIR="$srcdir"/gnulib
 
-    # Undefined references to __stack_chk_fail
-    CFLAGS=${CFLAGS/-fstack-protector-strong}
-
     # Undefined references to _GLOBAL_OFFSET_TABLE_
     CFLAGS=${CFLAGS/-fno-plt}
 
@@ -105,9 +102,6 @@ build() {
         mkdir "$srcdir"/grub/build_"$_arch"
         cd "$srcdir"/grub/build_"$_arch"
 
-        # Explicitly set ac_cv_header_sys_sysmacros_h
-        # https://savannah.gnu.org/bugs/index.php?55520
-
         # * _FORTIFY_SOURCE requires compiling with optimization warnings
         #   become errors due to a -Werror added during ./configure tests.
         #   This results in an incorrect configuration and only by adding -O2
@@ -126,8 +120,7 @@ build() {
                 --enable-nls \
                 --disable-silent-rules \
                 --disable-werror \
-                CPPFLAGS="$CPPFLAGS -O2" \
-                ac_cv_header_sys_sysmacros_h=yes
+                CPPFLAGS="$CPPFLAGS -O2" 
         make
     done
 }
@@ -140,9 +133,9 @@ package() {
         make DESTDIR="$pkgdir" bashcompletiondir=/usr/share/bash-completion/completions install
     done
 
-	# Install /etc/default/grub (used by grub-mkconfig)
-	install -D -m0644 "$srcdir"/grub.default "$pkgdir"/etc/default/grub
-	
+    # Install /etc/default/grub (used by grub-mkconfig)
+    install -D -m0644 "$srcdir"/grub.default "$pkgdir"/etc/default/grub
+
     # Tidy up
     find "$pkgdir"/usr/lib/grub \( -name '*.module' -o \
                                    -name '*.image' -o \
diff --git a/add-GRUB_COLOR_variables.patch b/add-GRUB_COLOR_variables.patch
index c113a81d5754..867e8feeb7b9 100644
--- a/add-GRUB_COLOR_variables.patch
+++ b/add-GRUB_COLOR_variables.patch
@@ -1,18 +1,27 @@
+From 21e5bcf22ab1a9f08c63e2a0212219d7482f77c1 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Wed, 10 Mar 2021 18:42:25 +0100
+Subject: [PATCH] 00_header: add GRUB_COLOR_* variables
+---
+ util/grub-mkconfig.in    | 2 ++
+ util/grub.d/00_header.in | 8 ++++++++
+ 2 files changed, 10 insertions(+)
+
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 3390ba9..c416489 100644
+index f8cbb8d7a..1189d95f9 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
-@@ -218,6 +218,8 @@ export GRUB_DEFAULT \
+@@ -246,6 +246,8 @@ export GRUB_DEFAULT \
+   GRUB_BACKGROUND \
    GRUB_THEME \
    GRUB_GFXPAYLOAD_LINUX \
-   GRUB_DISABLE_OS_PROBER \
 +  GRUB_COLOR_NORMAL \
 +  GRUB_COLOR_HIGHLIGHT \
    GRUB_INIT_TUNE \
    GRUB_SAVEDEFAULT \
    GRUB_ENABLE_CRYPTODISK \
 diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index d2e7252..8259f45 100644
+index 93a90233e..c5955df00 100644
 --- a/util/grub.d/00_header.in
 +++ b/util/grub.d/00_header.in
 @@ -125,6 +125,14 @@ cat <<EOF
diff --git a/10_linux-detect-archlinux-initramfs.patch b/detect-archlinux-initramfs.patch
index 512fa0451504..0f5568bf219e 100644
--- a/10_linux-detect-archlinux-initramfs.patch
+++ b/detect-archlinux-initramfs.patch
@@ -1,8 +1,16 @@
+From 058d08a025f9a6ec77d5ddd1fc62c7bd6abe1a52 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Wed, 10 Mar 2021 18:40:00 +0100
+Subject: [PATCH] 10_linux: detect archlinux initramfs
+---
+ util/grub.d/10_linux.in | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index f5d3e78..ef59c8c 100644
+index e8b01c0d0..e703dcdb0 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -83,6 +83,8 @@ linux_entry ()
+@@ -93,6 +93,8 @@ linux_entry ()
        case $type in
  	  recovery)
  	      title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
@@ -11,7 +19,7 @@ index f5d3e78..ef59c8c 100644
  	  *)
  	      title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
        esac
-@@ -186,7 +188,7 @@ while [ "x$list" != "x" ] ; do
+@@ -198,7 +200,7 @@ while [ "x$list" != "x" ] ; do
    basename=`basename $linux`
    dirname=`dirname $linux`
    rel_dirname=`make_system_path_relative_to_its_root $dirname`
@@ -20,7 +28,7 @@ index f5d3e78..ef59c8c 100644
    alt_version=`echo $version | sed -e "s,\.old$,,g"`
    linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
  
-@@ -248,6 +250,18 @@ while [ "x$list" != "x" ] ; do
+@@ -285,6 +287,18 @@ while [ "x$list" != "x" ] ; do
  
    linux_entry "${OS}" "${version}" advanced \
                "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
diff --git a/grub.default b/grub.default
index d6d41a91345c..6fd21c7fd223 100644
--- a/grub.default
+++ b/grub.default
@@ -51,4 +51,7 @@ GRUB_DISABLE_RECOVERY=true
 
 # Uncomment to make GRUB remember the last selection. This requires
 # setting 'GRUB_DEFAULT=saved' above.
-#GRUB_SAVEDEFAULT="true"
+#GRUB_SAVEDEFAULT=true
+
+# Uncomment to disable submenus in boot menu
+#GRUB_DISABLE_SUBMENU=y