diff --git a/0003-kern-efi-mm-increase-default-heap-size.patch b/0003-kern-efi-mm-increase-default-heap-size.patch deleted file mode 100644 index 4bc62ca..0000000 --- a/0003-kern-efi-mm-increase-default-heap-size.patch +++ /dev/null @@ -1,29 +0,0 @@ -From faedc1669cb4862020b572fdd013fbe7f5fb925c Mon Sep 17 00:00:00 2001 -From: Christian Hesse -Date: Fri, 2 Sep 2022 13:37:51 +0200 -Subject: [PATCH 1/1] kern/efi/mm: increase default heap size - -The new dynamic memory allocation slows down grub startup. Try to -fix / work around by increasing the default heap size. - -Signed-off-by: Christian Hesse ---- - grub-core/kern/efi/mm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c -index d290c9a76..598e6b6a2 100644 ---- a/grub-core/kern/efi/mm.c -+++ b/grub-core/kern/efi/mm.c -@@ -39,7 +39,7 @@ - #define MEMORY_MAP_SIZE 0x3000 - - /* The default heap size for GRUB itself in bytes. */ --#define DEFAULT_HEAP_SIZE 0x100000 -+#define DEFAULT_HEAP_SIZE 0x1000000 - - static void *finish_mmap_buf = 0; - static grub_efi_uintn_t finish_mmap_size = 0; --- -2.37.3 - diff --git a/PKGBUILD b/PKGBUILD index 6edc880..4d86cc1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -18,11 +18,11 @@ _GRUB_EMU_BUILD="0" pkgname='grub' pkgdesc='GNU GRand Unified Bootloader (2)' epoch=2 -_commit='d9b4638c50b16d4722e66d334e2c1a674b4a45cc' -_pkgver=2.06.r322.gd9b4638c5 +_commit='34037747033879287864be289abb911a29751634' +_pkgver=2.06.r334.g340377470 _unifont_ver='15.0.01' pkgver=${_pkgver/-/} -pkgrel=4 +pkgrel=1 url='https://www.gnu.org/software/grub/' arch=('x86_64') license=('GPL3') @@ -62,7 +62,6 @@ source=("git+https://git.savannah.gnu.org/git/grub.git#commit=${_commit}" "https://ftp.gnu.org/gnu/unifont/unifont-${_unifont_ver}/unifont-${_unifont_ver}.bdf.gz"{,.sig} '0001-00_header-add-GRUB_COLOR_-variables.patch' '0002-10_linux-detect-archlinux-initramfs.patch' - '0003-kern-efi-mm-increase-default-heap-size.patch' 'grub.default' 'sbat.csv') @@ -72,7 +71,6 @@ sha256sums=('SKIP' 'SKIP' '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab' '8488aec30a93e8fe66c23ef8c23aefda39c38389530e9e73ba3fbcc8315d244d' - '5529b5ef0cc735106b39b27329a6d1360323195cc2e75148d323ec0e681ed398' 'c17bf255a41103f6b71a1710afc7e9addaebc578bcf51a48845e227b2f651682' '98b23d41e223bdc0a6e20bdcb3aa77e642f29b64081b1fd2f575314172fc89df') @@ -130,9 +128,6 @@ prepare() { echo "Patch to detect of Arch Linux initramfs images by grub-mkconfig..." patch -Np1 -i "${srcdir}/0002-10_linux-detect-archlinux-initramfs.patch" - echo "Patch to increase default heap size..." - patch -Np1 -i "${srcdir}/0003-kern-efi-mm-increase-default-heap-size.patch" - echo "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"