!35 update to libblockdev-2.28

From: @foolstrong 
Reviewed-by: @liuzhiqiang26 
Signed-off-by: @liuzhiqiang26
This commit is contained in:
openeuler-ci-bot 2022-12-28 06:59:46 +00:00 committed by Gitee
commit dcc259ca3e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 5 additions and 33 deletions

View File

@ -1,30 +0,0 @@
From 332c90019613797a2a634020f288a81a09b8b985 Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Tue, 18 Aug 2020 09:44:29 +0200
Subject: [PATCH 09/15] dm: Fix comparing DM RAID member devices UUID
There is no "UUID" property in UDev we must use the "ID_FS_UUID"
one.
This comparison works only because most DM RAID members don't have
UUID so the check is skipped, but it fails for DDF RAID members
which have a special GUID/UUID in UDev database.
---
src/plugins/dm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/dm.c b/src/plugins/dm.c
index fb4e50b..93a47f4 100644
--- a/src/plugins/dm.c
+++ b/src/plugins/dm.c
@@ -481,7 +481,7 @@ static gboolean raid_dev_matches_spec (struct raid_dev *raid_dev, const gchar *n
context = udev_new ();
device = udev_device_new_from_subsystem_sysname (context, "block", dev_name);
- dev_uuid = udev_device_get_property_value (device, "UUID");
+ dev_uuid = udev_device_get_property_value (device, "ID_FS_UUID");
major_str = udev_device_get_property_value (device, "MAJOR");
minor_str = udev_device_get_property_value (device, "MINOR");
--
1.8.3.1

Binary file not shown.

BIN
libblockdev-2.28.tar.gz Normal file

Binary file not shown.

View File

@ -1,6 +1,6 @@
Name: libblockdev
Version: 2.26
Release: 2
Version: 2.28
Release: 1
Summary: libblockdev is a C library supporting GObject introspection for manipulation of block devices
License: LGPLv2+
URL: https://github.com/storaged-project/libblockdev
@ -13,7 +13,6 @@ Patch4: 0004-lvm-dbus-Fix-memory-leak-in-bd_lvm_cache_attach.patch
Patch5: 0005-lvm-Fix-memory-leak-bd_lvm_cache_create_cached_lv.patch
Patch6: 0006-fs-Fix-return-values-in-bd_fs_ntfs_get_info.patch
Patch7: 0007-fs-Fix-return-values-in-bd_fs_xfs_get_info.patch
Patch8: 0008-dm-Fix-comparing-DM-RAID-member-devices-UUID.patch
BuildRequires: make glib2-devel libyaml-devel libbytesize-devel parted-devel libuuid-devel ndctl-devel device-mapper-devel
BuildRequires: device-mapper-devel dmraid-devel systemd-devel nss-devel volume_key-devel >= 0.3.9-7 libblkid-devel libmount-devel
@ -164,6 +163,9 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm}
%changelog
* Tue Dec 20 2022 wangzhiqiang <wangzhiqiang95@huawei.com> - 2.28-1
- update to libblockdev-2.28
* Wed Jun 15 2022 Hongtao Zhang <zhanghongtao22@huawei.com> - 2.26-2
- Add BuildRequire make