Incomplete-Chineseization-of-disk-mount.patch

@@ -1,26 +1,8 @@
-From 7276d3ed7a3385292eb9a250735da575e345ff99 Mon Sep 17 00:00:00 2001
-From: sun_hai_10 <sunhai10@huawei.com>
-Date: Wed, 4 Dec 2024 17:42:17 +0800
-Subject: [PATCH] Incomplete Chineseization of disk mount
-
----
- blivet/devicefactory.py | 9 +++++----
- po/zh_CN.po             | 4 ++++
- 2 files changed, 9 insertions(+), 4 deletions(-)
-
 diff --git a/blivet/devicefactory.py b/blivet/devicefactory.py
-index b995cc2..a9b1f1a 100644
+index b995cc2..ca816fc 100644
 --- a/blivet/devicefactory.py
 +++ b/blivet/devicefactory.py
-@@ -41,6 +41,7 @@ from .partitioning import TotalSizeSet
- from .partitioning import do_partitioning
- from .size import Size
- from .static_data import luks_data
-+from .i18n import _
- 
- import gi
- gi.require_version("BlockDev", "3.0")
-@@ -724,7 +725,7 @@ class DeviceFactory(object):
+@@ -724,7 +724,7 @@ class DeviceFactory(object):
          # the container
          size = self._get_device_size()
          if size <= Size(0):
@@ -29,7 +11,7 @@ index b995cc2..a9b1f1a 100644
  
          parents = self._get_parent_devices()
  
-@@ -1348,7 +1349,7 @@ class LVMFactory(DeviceFactory):
+@@ -1348,7 +1348,7 @@ class LVMFactory(DeviceFactory):
                  self.size += self.device.size
  
              if self.size == Size(0):
@@ -38,7 +20,7 @@ index b995cc2..a9b1f1a 100644
          else:
              super(LVMFactory, self)._handle_no_size()
  
-@@ -2119,7 +2120,7 @@ class StratisFactory(DeviceFactory):
+@@ -2119,7 +2119,7 @@ class StratisFactory(DeviceFactory):
                  self.size += self.device.size
  
              if self.size == Size(0):
@@ -47,7 +29,7 @@ index b995cc2..a9b1f1a 100644
          else:
              super(StratisFactory, self)._handle_no_size()
  
-@@ -2170,7 +2171,7 @@ class StratisFactory(DeviceFactory):
+@@ -2170,7 +2170,7 @@ class StratisFactory(DeviceFactory):
          # the container
          size = self._get_device_size()
          if size <= Size(0):
@@ -71,6 +53,3 @@ index 5b7ac92..21309ac 100644
  #: ../blivet/iscsi.py:216
  msgid "Unable to change iSCSI initiator name once set"
  msgstr "设定后就无法更改 iSCSI 启动程序名称"
--- 
-2.33.0
-

backport-Fix-intel-biosraid-cant-get-device-name-causing-crashed.patch

@@ -1,32 +0,0 @@
-From 9d7d0428c81ce592c807f2cefcf7228a1b3d8789 Mon Sep 17 00:00:00 2001
-From: "Yurii.Huang" <yurii.huang@dbappsecurity.com.cn>
-Date: Wed, 21 Aug 2024 18:31:04 +0800
-Subject: [PATCH] Fix intel biosraid can't get device name causing crashed
-
-  crashed with DiskDevice get members property
-  trace: 'DiskDevice' object has no attribute 'members'
-  changed: when ID_FS_TYPE is isw_raid_member use SYS_NAME to device name
- 
-Reference:https://github.com/storaged-project/blivet/commit/9d7d0428c81ce592c807f2cefcf7228a1b3d8789
-Conflict:NA
----
- blivet/udev.py | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/blivet/udev.py b/blivet/udev.py
-index 70fc722f5..667e1f3c9 100644
---- a/blivet/udev.py
-+++ b/blivet/udev.py
-@@ -243,6 +243,10 @@ def device_get_name(udev_info):
-         elif device_get_format(udev_info) == "linux_raid_member":
-             # MD RAID member -> use SYS_NAME
-             name = udev_info["SYS_NAME"]
-+        elif device_get_format(udev_info) == "isw_raid_member":
-+            # intel software biosraid
-+            # MD RAID member -> use SYS_NAME
-+            name = udev_info["SYS_NAME"]
-         elif device_is_partition(udev_info):
-             # partition on RAID -> construct name from MD_DEVNAME + partition number
-             # for partitions on named RAID we want to use the raid name, not
- -- 
-2.27.0

bugfix-fix-empty-UUIDs-for-NVMe-namespaces.patch

@@ -1,25 +0,0 @@
-From f1aa249bc848634ccd1d6694b59321eac31b5f0e Mon Sep 17 00:00:00 2001
-From: sunhai <sunhai10@huawei.com>
-Date: Wed, 17 Apr 2024 00:20:07 +0800
-Subject: [PATCH] fix empty UUIDs for NVMe namespaces
-
----
- blivet/populator/helpers/disk.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/blivet/populator/helpers/disk.py b/blivet/populator/helpers/disk.py
-index 43c902a..b9ec843 100644
---- a/blivet/populator/helpers/disk.py
-+++ b/blivet/populator/helpers/disk.py
-@@ -287,7 +287,7 @@ class NVMeNamespaceDevicePopulator(DiskDevicePopulator):
-             kwargs["eui64"] = ninfo.eui64
-             kwargs["nguid"] = ninfo.nguid
- 
--            if ninfo.uuid and ninfo.uuid != uuid.UUID(int=0):
-+            if ninfo.uuid and str(ninfo.uuid) != str(uuid.UUID(int=0)):
-                 kwargs["uuid"] = ninfo.uuid
-             else:
-                 kwargs["uuid"] = None
--- 
-2.43.0
-

bugfix-revert-Prefer-UUID-for-fstab-spec-for-DM-devices-too.patch

@@ -1,31 +0,0 @@
-From d14af518e0031336861c8fdaeb3c4534e7c2fd6f Mon Sep 17 00:00:00 2001
-From: s30028044 <sunhai10@huawei.com>
-Date: Sat, 29 Jun 2024 16:53:26 +0800
-Subject: [PATCH] revert Prefer UUID for fstab spec for DM devices too
-
-revert the patch of "Prefer UUID for fstab spec for DM devices too"
-Reference: https://github.com/storaged-project/blivet/commit/7aa07083dbc90b0fabea063ca5a19ee3d154b1b2
-Conflict: https://github.com/storaged-project/blivet/commit/7aa07083dbc90b0fabea063ca5a19ee3d154b1b2
----
- blivet/devices/dm.py | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/blivet/devices/dm.py b/blivet/devices/dm.py
-index 4362f82..0ac5f01 100644
---- a/blivet/devices/dm.py
-+++ b/blivet/devices/dm.py
-@@ -97,6 +97,11 @@ class DMDevice(StorageDevice):
-         d.update({"target": self.target, "dm_uuid": self.dm_uuid})
-         return d
- 
-+    @property
-+    def fstab_spec(self):
-+        """ Return the device specifier for use in /etc/fstab. """
-+        return self.path
-+
-     @property
-     def map_name(self):
-         """ This device's device-mapper map name """
--- 
-2.27.0
-

python-blivet.spec

@@ -3,7 +3,7 @@
 
 Name:           python-blivet
 Version:        3.8.2
-Release:        9
+Release:        4
 Epoch:          1
 Summary:        A python module for system storage configuration
 License:        LGPL-2.1-or-later
@@ -25,9 +25,6 @@ patch9001:      blivet-3.4.2-sw.patch
 patch9002:      Incomplete-Chineseization-of-disk-mount.patch
 
 patch6001:      backport-Ignore-invalid-empty-UUIDs-for-NVMe-namespaces.patch
-patch9003:      bugfix-fix-empty-UUIDs-for-NVMe-namespaces.patch
-patch9004:      bugfix-revert-Prefer-UUID-for-fstab-spec-for-DM-devices-too.patch
-patch6002:      backport-Fix-intel-biosraid-cant-get-device-name-causing-crashed.patch
 
 %description
 The python-blivet package is a python module for examining and modifying
@@ -50,7 +47,6 @@ Requires:       systemd-udev blivet-data = %{epoch}:%{version}-%{release}
 Recommends:     libblockdev-btrfs >= 3.0 libblockdev-crypto >= 3.0 libblockdev-dm >= 3.0
 Recommends:     libblockdev-lvm >= 3.0 libblockdev-mdraid >= 3.0 libblockdev-mpath >= 3.0
 Recommends:     libblockdev-loop >= 3.0 libblockdev-swap >= 3.0
-Recommends:     fcoe-utils
 %ifarch s390 s390x
 Recommends:     libblockdev-s390 >= 3.0 
 %endif
@@ -130,36 +126,6 @@ make PYTHON=%{__python2} DESTDIR=%{buildroot} install
 %doc README.md
 
 %changelog
-* Wed Dec 04 2024 sunhai<sunhai10@huawei.com> - 1:3.8.2-9
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:fix anaconda partition error tip
-
-* Tue Oct 22 2024 sunhai<sunhai10@huawei.com> - 1:3.8.2-8
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:Fix intel biosraid can't get device name causing crashed
-
-* Sat Jun 29 2024 sunhai<sunhai10@huawei.com> - 1:3.8.2-7
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:revert Prefer UUID for fstab spec for DM devices too
-
-* Mon Jun 17 2024 yueyuankun <yueyuankun@kylinos.cn> - 1:3.8.2-6
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:Add Recommends fcoe-utils
-
-* Fri May 10 2024 sunhai<sunhai10@huawei.com> - 1:3.8.2-5
-- Type:bugfix
-- ID:NA
-- SUG:NA
-- DESC:fix empty UUIDs for NVMe namespaces
-
 * Mon Apr 15 2024 sunhai<sunhai10@huawei.com> - 1:3.8.2-4
 - Type:bugfix
 - ID:NA