From f98e5f0254d1d5ce5c541df3b1149aa357d53c7c Mon Sep 17 00:00:00 2001
From: Huang Yang <huangyang@loongson.cn>
Date: Mon, 22 Apr 2024 08:34:56 +0000
Subject: [PATCH] Fix patch 9025 error on loongarch64

---
 0001-add-loongarch-support-for-anaconda.patch | 18 +++++++++---------
 anaconda.spec                                 | 16 ++++++++++++----
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/0001-add-loongarch-support-for-anaconda.patch b/0001-add-loongarch-support-for-anaconda.patch
index d6130a1..15d7a8d 100644
--- a/0001-add-loongarch-support-for-anaconda.patch
+++ b/0001-add-loongarch-support-for-anaconda.patch
@@ -1,6 +1,6 @@
-From b4cffadd1304fc2da30a727b030415168fcf7708 Mon Sep 17 00:00:00 2001
-From: Wenlong Zhang <zhangwenlong@loongson.cn>
-Date: Mon, 12 Dec 2022 01:37:57 +0000
+From ad79c2e137e801c490fc35d4cecefbca6619fbea Mon Sep 17 00:00:00 2001
+From: Huang Yang <huangyang@loongson.cn>
+Date: Thu, 25 Apr 2024 12:14:01 +0000
 Subject: [PATCH] add loongarch support for anaconda
 
 ---
@@ -12,7 +12,7 @@ Subject: [PATCH] add loongarch support for anaconda
  5 files changed, 57 insertions(+), 5 deletions(-)
 
 diff --git a/pyanaconda/modules/storage/bootloader/base.py b/pyanaconda/modules/storage/bootloader/base.py
-index 533d528..02ca7ca 100644
+index d40086d..191b8af 100644
 --- a/pyanaconda/modules/storage/bootloader/base.py
 +++ b/pyanaconda/modules/storage/bootloader/base.py
 @@ -796,11 +796,14 @@ class BootLoader(object):
@@ -34,7 +34,7 @@ index 533d528..02ca7ca 100644
          # Does /usr have its own device? If so, we need to tell dracut
          usr_device = storage.mountpoints.get("/usr")
 diff --git a/pyanaconda/modules/storage/bootloader/efi.py b/pyanaconda/modules/storage/bootloader/efi.py
-index 1b47e24..99efde6 100644
+index 6135699..96450dc 100644
 --- a/pyanaconda/modules/storage/bootloader/efi.py
 +++ b/pyanaconda/modules/storage/bootloader/efi.py
 @@ -28,7 +28,7 @@ from pyanaconda.product import productName
@@ -46,7 +46,7 @@ index 1b47e24..99efde6 100644
  
  
  class EFIBase(object):
-@@ -203,6 +203,37 @@ class Aarch64EFIGRUB(EFIGRUB):
+@@ -169,6 +169,37 @@ class Aarch64EFIGRUB(EFIGRUB):
          super().__init__()
          self._packages64 = ["grub2-efi-aa64", "shim-aa64"]
  
@@ -100,11 +100,11 @@ index 8aa3afb..2fb9993 100644
              from pyanaconda.modules.storage.bootloader.efi import MacEFIGRUB
              return MacEFIGRUB
 diff --git a/pyanaconda/modules/storage/devicetree/fsset.py b/pyanaconda/modules/storage/devicetree/fsset.py
-index 0d151d3..26667dd 100644
+index 4db3759..6f85a37 100644
 --- a/pyanaconda/modules/storage/devicetree/fsset.py
 +++ b/pyanaconda/modules/storage/devicetree/fsset.py
 @@ -23,6 +23,7 @@ import gi
- gi.require_version("BlockDev", "2.0")
+ gi.require_version("BlockDev", "3.0")
  from gi.repository import BlockDev as blockdev
  
 +from blivet import arch
@@ -152,5 +152,5 @@ index d0aa7ca..3a238f9 100644
              return EFI()
      elif arch.is_x86():
 -- 
-2.33.0
+2.43.0
 
diff --git a/anaconda.spec b/anaconda.spec
index cecbbe6..1fea1b3 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,7 +1,7 @@
 %define _empty_manifest_terminate_build 0
 Name:    anaconda
 Version: 36.16.5
-Release: 31
+Release: 32
 Summary: Graphical system installer
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -15,9 +15,6 @@ Source5: nestos.conf
 %ifarch sw_64
 Patch6001:    anaconda-33.19.sw.patch
 %endif
-%ifarch loongarch64
-Patch6002:    0001-add-loongarch-support-for-anaconda.patch
-%endif
 
 Patch9000:    add-passwd-policy.patch
 Patch9001:    bugfix-GUI-nfs-unknown-error.patch
@@ -59,6 +56,11 @@ Patch9024:    bugfix-revert-Set-default-entry-to-the-BLS-id-instead-of-the-entry
 Patch9025:    bugfix-import-new-BlockDev.patch
 Patch9026:    bugfix-fix-custom-storage-chinese-tip.patch
 
+%ifarch loongarch64
+Patch10000:    0001-add-loongarch-support-for-anaconda.patch
+%endif
+
+
 %define dasbusver 1.3
 %define dbusver 1.2.3
 %define dnfver 3.6.0
@@ -313,6 +315,12 @@ update-desktop-database &> /dev/null || :
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Mon Apr 22 2024 Huang Yang <huangyang@loongson.cn> - 36.16.5-32
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: fix patch9025 error on loongarch64
+
 * Sat Apr 20 2024 sunhai <sunhai10@huawei.com> - 36.16.5-31
 - Type:bugfix
 - ID:NA