- Adjust for new name for vio disks (from danpb)

- And fix the build (also from danpb)
This commit is contained in:
Jeremy Katz 2008-04-03 03:21:02 +00:00
parent cef6e7d7e3
commit 2fc38210ee
3 changed files with 19 additions and 2 deletions

11
lvm2-limits-include.patch Normal file
View File

@ -0,0 +1,11 @@
diff -rup LVM2.2.02.33.orig/daemons/clvmd/clvmd.c LVM2.2.02.33.new/daemons/clvmd/clvmd.c
--- LVM2.2.02.33.orig/daemons/clvmd/clvmd.c 2007-11-15 05:16:14.000000000 -0500
+++ LVM2.2.02.33.new/daemons/clvmd/clvmd.c 2008-04-02 14:40:13.000000000 -0400
@@ -38,6 +38,7 @@
#include <syslog.h>
#include <errno.h>
#include <libdlm.h>
+#include <limits.h>
#include "clvmd-comms.h"
#include "lvm-functions.h"

View File

@ -5,7 +5,7 @@ diff -up LVM2.2.02.33/lib/filters/filter.c.vio LVM2.2.02.33/lib/filters/filter.c
{"xvd", 16}, /* Xen virtual block device */ {"xvd", 16}, /* Xen virtual block device */
{"vdisk", 8}, /* SUN's LDOM virtual block device */ {"vdisk", 8}, /* SUN's LDOM virtual block device */
{"ps3disk", 16}, /* PlayStation 3 internal disk */ {"ps3disk", 16}, /* PlayStation 3 internal disk */
+ {"vd", 8}, /* VirtIO disk */ + {"virtblk", 8}, /* VirtIO disk */
{NULL, 0} {NULL, 0}
}; };

View File

@ -6,7 +6,7 @@
Summary: Userland logical volume management tools Summary: Userland logical volume management tools
Name: lvm2 Name: lvm2
Version: 2.02.33 Version: 2.02.33
Release: 10%{?dist} Release: 11%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Base Group: System Environment/Base
URL: http://sources.redhat.com/lvm2 URL: http://sources.redhat.com/lvm2
@ -14,6 +14,7 @@ Source0: LVM2.%{version}.tgz
Source1: device-mapper.%{device_mapper_version}.tgz Source1: device-mapper.%{device_mapper_version}.tgz
Patch0: cluster-locking-built-in.patch Patch0: cluster-locking-built-in.patch
Patch1: lvm2-vio-disk.patch Patch1: lvm2-vio-disk.patch
Patch2: lvm2-limits-include.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
@ -38,6 +39,7 @@ or more physical volumes and creating one or more logical volumes
%setup -q -T -D -a 1 -n LVM2.%{version} %setup -q -T -D -a 1 -n LVM2.%{version}
%patch -p1 -b .locking %patch -p1 -b .locking
%patch1 -p1 %patch1 -p1
%patch2 -p1
%build %build
cd device-mapper.%{device_mapper_version} cd device-mapper.%{device_mapper_version}
@ -269,6 +271,10 @@ This package contains the device-mapper shared library, libdevmapper.
%changelog %changelog
* Wed Apr 2 2008 Jeremy Katz <katzj@redhat.com> - 2.02.33-11
- Adjust for new name for vio disks (from danpb)
- And fix the build (also from danpb)
* Wed Mar 5 2008 Jeremy Katz <katzj@redhat.com> - 2.02.33-10 * Wed Mar 5 2008 Jeremy Katz <katzj@redhat.com> - 2.02.33-10
- recognize vio disks - recognize vio disks