From 3ae99513ed36146ed6864ce1339578e65dc6d847 Mon Sep 17 00:00:00 2001
From: "taifu.gc" <taifu.gc@alibaba-inc.com>
Date: Thu, 30 May 2024 10:03:22 +0000
Subject: [PATCH] Avoid patch loongarch-specified patches on other arches

---
 grub.macros  | 2 +-
 grub.patches | 2 +-
 grub2.spec   | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/grub.macros b/grub.macros
index 1166f2b..40d7fd7 100644
--- a/grub.macros
+++ b/grub.macros
@@ -342,7 +342,7 @@ git add .							\
 git commit -a -q -m "%{tarversion} baseline."			\
 git am --whitespace=nowarn %%{patches} </dev/null		\
 %ifnarch loongarch64	                                        \
-git reset --hard HEAD^                                                \
+git reset --hard HEAD~3                                                \
 %endif                                                          \
 rm -r build-aux m4						\
 ./bootstrap							\
diff --git a/grub.patches b/grub.patches
index 3b94a74..c6da383 100644
--- a/grub.patches
+++ b/grub.patches
@@ -201,9 +201,9 @@ Patch0262: 1000-blscfg-Don-t-root-device-in-emu-builds.patch
 Patch1001: 1000-drop-other-efi_call_X-and-fix-build-issue.patch
 Patch1002: 0001-newfeature-tpcm-add-tpcm-support.patch
 Patch1003: 0002-newfeature-tpcm-embed-tpcm-module-into-kernel.img-by.patch
-Patch1004: 1004-Revert-Add-support-for-Linux-EFI-stub-loading.patch
 Patch1005: 1005-CVE-2024-1048-grub-set-bootflag-Conservative-partial-fix.patch
 Patch1006: 1006-CVE-2024-1048-grub-set-bootflag-More-complete-fix.patch
 Patch1007: 1007-CVE-2024-1048-grub-set-bootflag-Exit-calmly-when-not.patch
+Patch1004: 1004-Revert-Add-support-for-Linux-EFI-stub-loading.patch
 Patch1008: 1008-loongarch-add-back-compatibility-for-linux-kernel.patch
 Patch1009: 1009-configure-Add-GRUB_CPU_LOONGARCH64-support.patch
diff --git a/grub2.spec b/grub2.spec
index 6b2cfaa..c58aea1 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -1,4 +1,4 @@
-%define anolis_release 7
+%define anolis_release 8
 %global _lto_cflags %{nil}
 
 %undefine _hardened_build
@@ -506,6 +506,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
+* Thu May 30 2024 Chang Gao <gc-taifu@linux.alibaba.com> - 2.12-8
+- Avoid loongarch specifed patches patched on other arches
+
 * Fri May 24 2024 Juxin Gao <gaojuxin@loongson.cn> - 2.12-7
 - Add GRUB_CPU_LOONGARCH64 for loongson platform
 
-- 
Gitee