From 4f3154c1dcbe4a0b6f4c87297155cf259146e55b Mon Sep 17 00:00:00 2001
From: "taifu.gc" <taifu.gc@alibaba-inc.com>
Date: Thu, 28 Mar 2024 00:12:04 +0800
Subject: [PATCH] Fix build failed with grub2.12

---
 1017-adapt-new-version-grub2-efi-config.patch | 25 +++++++++++++++++++
 lorax-templates-anolis.spec                   |  6 ++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 1017-adapt-new-version-grub2-efi-config.patch

diff --git a/1017-adapt-new-version-grub2-efi-config.patch b/1017-adapt-new-version-grub2-efi-config.patch
new file mode 100644
index 0000000..fcf81ba
--- /dev/null
+++ b/1017-adapt-new-version-grub2-efi-config.patch
@@ -0,0 +1,25 @@
+From 0558e8f5051ae32d685a148e9a61b64c5a2df599 Mon Sep 17 00:00:00 2001
+From: "taifu.gc" <taifu.gc@alibaba-inc.com>
+Date: Thu, 28 Mar 2024 00:27:22 +0800
+Subject: [PATCH] 2
+
+---
+ 80-anolis/efi.tmpl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/80-anolis/efi.tmpl b/80-anolis/efi.tmpl
+index 5e43ee6..de1bf6e 100644
+--- a/80-anolis/efi.tmpl
++++ b/80-anolis/efi.tmpl
+@@ -22,7 +22,7 @@ install boot/efi/EFI/*/grubloongarch64.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI
+ install boot/efi/EFI/*/grubloongarch64.efi ${EFIBOOTDIR}/BOOTLOONGARCH.EFI
+ install boot/efi/EFI/*/grubloongarch64.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi
+ %endif
+-install boot/grub2/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/
++install boot/efi/EFI/anolis/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/
+ 
+ ## actually make the EFI images
+ ${make_efiboot("images/efiboot.img")}
+-- 
+2.19.2
+
diff --git a/lorax-templates-anolis.spec b/lorax-templates-anolis.spec
index 6cd2c75..f851812 100644
--- a/lorax-templates-anolis.spec
+++ b/lorax-templates-anolis.spec
@@ -1,4 +1,4 @@
-%define anolis_release 19
+%define anolis_release 20
 
 Name:           lorax-templates-anolis
 Version:        37.0
@@ -28,6 +28,7 @@ Patch1013:      1013-remove-strace-in-loongarch.patch
 Patch1014:	1014-add-loongarch64-support-for-lorax-templates-anolis.patch
 Patch1015:	1015-add-boot.iso-for-loongarch64.patch
 Patch1016:	1016-remove-deprecated-kernel-packs-in-6.6-version.patch
+Patch1017:	1017-adapt-new-version-grub2-efi-config.patch 
 
 
 # Where are these supposed to end up?
@@ -53,6 +54,9 @@ cp -a 80-anolis/* $RPM_BUILD_ROOT/%{templatedir}
 %{templatedir}/*
 
 %changelog
+* Wed Mar 27 2024 Chang Gao <gc-taifu@linux.alibaba.com> - 37.0-1.20
+- Adapt new grub2 efi path
+
 * Tue Mar 26 2024 Chang Gao <gc-taifu@linux.alibaba.com> - 37.0.1-19
 - Explict kmod-ast for temporary
 
-- 
Gitee