rpms/udisks/devel udisks-1.0.1-Update-to-latest-LVM2-API.patch, NONE, 1.1 udisks.spec, 1.14, 1.15
David Zeuthen
davidz at fedoraproject.org
Wed May 19 17:14:02 UTC 2010
Author: davidz
Update of /cvs/pkgs/rpms/udisks/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5868
Modified Files:
udisks.spec
Added Files:
udisks-1.0.1-Update-to-latest-LVM2-API.patch
Log Message:
* Wed May 19 2010 David Zeuthen <davidz at redhat.com> - 1.0.1-4%{?dist}
- Actually make udisks work with latest liblvm2app
udisks-1.0.1-Update-to-latest-LVM2-API.patch:
configure.ac | 2 +-
src/probers/udisks-lvm-pv-export.c | 31 ++++++++++---------------------
2 files changed, 11 insertions(+), 22 deletions(-)
--- NEW FILE udisks-1.0.1-Update-to-latest-LVM2-API.patch ---
>From 2b2fcf80841972b70ad695a5a1ed74487d4fd37a Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Wed, 19 May 2010 13:01:31 -0400
Subject: [PATCH] Update to latest LVM2 API
See
http://lists.freedesktop.org/archives/devkit-devel/2010-April/000783.html
---
configure.ac | 2 +-
src/probers/udisks-lvm-pv-export.c | 30 ++++++++++--------------------
2 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/configure.ac b/configure.ac
index 469be5f..a9141bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -170,7 +170,7 @@ AC_SUBST(DEVMAPPER_LIBS)
have_lvm2=no
AC_ARG_ENABLE(lvm2, AS_HELP_STRING([--disable-lvm2], [disable LVM2 support]))
if test "x$enable_lvm2" != "xno"; then
- PKG_CHECK_MODULES(LVM2, lvm2app >= 2.1,
+ PKG_CHECK_MODULES(LVM2, lvm2app >= 2.2,
[AC_DEFINE(HAVE_LVM2, 1, [Define if LVM2 is available]) have_lvm2=yes],
have_lvm2=no)
AC_SUBST(LVM2_CFLAGS)
diff --git a/src/probers/udisks-lvm-pv-export.c b/src/probers/udisks-lvm-pv-export.c
index 5675fb8..ee6d8ed 100644
--- a/src/probers/udisks-lvm-pv-export.c
+++ b/src/probers/udisks-lvm-pv-export.c
@@ -47,7 +47,7 @@ find_vg_for_pv_uuid (lvm_t lvm_ctx,
struct lvm_pv_list *pv_list;
dm_list_iterate_items (pv_list, pvs)
{
- char *uuid;
+ const char *uuid;
pv_t pv = pv_list->pv;
uuid = lvm_pv_get_uuid (pv);
@@ -58,10 +58,8 @@ find_vg_for_pv_uuid (lvm_t lvm_ctx,
if (out_pv != NULL)
*out_pv = pv;
ret = vg;
- dm_free (uuid);
goto out;
}
- dm_free (uuid);
}
}
}
@@ -79,12 +77,12 @@ find_vg_for_pv_uuid (lvm_t lvm_ctx,
static void
print_vg (vg_t vg)
{
- char *s;
+ const char *s;
struct dm_list *pvs;
struct dm_list *lvs;
- s = lvm_vg_get_uuid (vg); g_print ("UDISKS_LVM2_PV_VG_UUID=%s\n", s); dm_free (s);
- s = lvm_vg_get_name (vg); g_print ("UDISKS_LVM2_PV_VG_NAME=%s\n", s); dm_free (s);
+ s = lvm_vg_get_uuid (vg); g_print ("UDISKS_LVM2_PV_VG_UUID=%s\n", s);
+ s = lvm_vg_get_name (vg); g_print ("UDISKS_LVM2_PV_VG_NAME=%s\n", s);
g_print ("UDISKS_LVM2_PV_VG_SIZE=%" G_GUINT64_FORMAT "\n", lvm_vg_get_size (vg));
g_print ("UDISKS_LVM2_PV_VG_FREE_SIZE=%" G_GUINT64_FORMAT "\n", lvm_vg_get_free_size (vg));
g_print ("UDISKS_LVM2_PV_VG_EXTENT_SIZE=%" G_GUINT64_FORMAT "\n", lvm_vg_get_extent_size (vg));
@@ -117,17 +115,14 @@ print_vg (vg_t vg)
str = g_string_new (NULL);
dm_list_iterate_items (pv_list, pvs)
{
- char *uuid;
+ const char *uuid;
guint64 size;
guint64 free_size;
pv_t pv = pv_list->pv;
uuid = lvm_pv_get_uuid (pv);
if (uuid != NULL)
- {
- g_string_append_printf (str, "uuid=%s", uuid);
- dm_free (uuid);
- }
+ g_string_append_printf (str, "uuid=%s", uuid);
size = lvm_pv_get_size (pv);
g_string_append_printf (str, ";size=%" G_GUINT64_FORMAT, size);
free_size = lvm_pv_get_free (pv);
@@ -173,8 +168,8 @@ print_vg (vg_t vg)
str = g_string_new (NULL);
dm_list_iterate_items (lv_list, lvs)
{
- char *uuid;
- char *name;
+ const char *uuid;
+ const char *name;
gboolean is_active;
guint64 size;
lv_t lv = lv_list->lv;
@@ -195,11 +190,6 @@ print_vg (vg_t vg)
g_string_append_printf (str, "active=%d", is_active);
g_string_append_c (str, ' ');
}
-
- if (uuid != NULL)
- dm_free (uuid);
- if (name != NULL)
- dm_free (name);
}
g_print ("UDISKS_LVM2_PV_VG_LV_LIST=%s\n", str->str);
g_string_free (str, TRUE);
@@ -212,9 +202,9 @@ print_vg (vg_t vg)
static void
print_pv (pv_t pv)
{
- char *s;
+ const char *s;
- s = lvm_pv_get_uuid (pv); g_print ("UDISKS_LVM2_PV_UUID=%s\n", s); dm_free (s);
+ s = lvm_pv_get_uuid (pv); g_print ("UDISKS_LVM2_PV_UUID=%s\n", s);
g_print ("UDISKS_LVM2_PV_NUM_MDA=%" G_GUINT64_FORMAT "\n", lvm_pv_get_mda_count (pv));
/* TODO: ask for more API in liblvm - pvdisplay(8) suggests more information
--
1.7.0.1
Index: udisks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udisks/devel/udisks.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- udisks.spec 3 May 2010 07:53:56 -0000 1.14
+++ udisks.spec 19 May 2010 17:14:02 -0000 1.15
@@ -9,12 +9,12 @@
%define libatasmart_version 0.12
%define sg3_utils_version 1.27
%define smp_utils_version 0.94
-%define lvm2_version 2.02.61
+%define lvm2_version 2.02.65
Summary: Storage Management Service
Name: udisks
Version: 1.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://www.freedesktop.org/wiki/Software/udisks
@@ -71,6 +71,8 @@ Requires: lvm2-libs >= %{lvm2_version}
Obsoletes: DeviceKit-disks <= 009
Provides: DeviceKit-disks = 010
+Patch0: udisks-1.0.1-Update-to-latest-LVM2-API.patch
+
%description
udisks provides a daemon, D-Bus API and command line tools
for managing disks and storage devices.
@@ -91,6 +93,7 @@ D-Bus interface definitions and document
%prep
%setup -q
+%patch0 -p1 -b .latest-lvm2-api
%build
%configure --enable-gtk-doc
@@ -165,6 +168,9 @@ rm -rf $RPM_BUILD_ROOT
# Note: please don't forget the %{?dist} in the changelog. Thanks
#
%changelog
+* Wed May 19 2010 David Zeuthen <davidz at redhat.com> - 1.0.1-4%{?dist}
+- Actually make udisks work with latest liblvm2app
+
* Mon May 05 2010 Adam Tkac <atkac redhat com> - 1.0.1-3%{?dist}
- rebuilt against new lvm2 libraries
More information about the scm-commits
mailing list