A few little fixes and attempt to make it work with new version of corosync.
This commit is contained in:
Alasdair G Kergon
parent
65219c8dce
commit
d2a259b46c
18
.gitignore
vendored
18
.gitignore
vendored
@ -1,17 +1 @@
|
||||
LVM2.2.02.70.tgz
|
||||
LVM2.2.02.72.tgz
|
||||
LVM2.2.02.73.tgz
|
||||
/LVM2.2.02.74.tgz
|
||||
/LVM2.2.02.75.tgz
|
||||
/LVM2.2.02.76.tgz
|
||||
/LVM2.2.02.77.tgz
|
||||
/LVM2.2.02.78.tgz
|
||||
/LVM2.2.02.79.tgz
|
||||
/LVM2.2.02.81.tgz
|
||||
/LVM2.2.02.82.tgz
|
||||
/LVM2.2.02.83.tgz
|
||||
/LVM2.2.02.84.tgz
|
||||
/LVM2.2.02.86.tgz
|
||||
/LVM2.2.02.87.tgz
|
||||
/LVM2.2.02.88.tgz
|
||||
/LVM2.2.02.89.tgz
|
||||
/LVM2.2.02.90.tgz
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.2.1 (GNU/Linux)
|
||||
|
||||
iD8DBQBPIfksIoGRwVZ+LBcRAo4FAKD3YIHOcs5NsgiIHz+ad+n3568CmACg5kYI
|
||||
IoXXCZT4Df0Nk+fSHH2hpww=
|
||||
=9Jg3
|
||||
-----END PGP SIGNATURE-----
|
||||
7
LVM2.2.02.90.tgz.asc
Normal file
7
LVM2.2.02.90.tgz.asc
Normal file
@ -0,0 +1,7 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.2.1 (GNU/Linux)
|
||||
|
||||
iD8DBQBPKVirIoGRwVZ+LBcRAtVYAJ9L+4t5OWbr5YL9CN1guRyWbN2UmgCgqU9B
|
||||
2xBVgPI24sHJP2Kok/ivzRg=
|
||||
=Rkl5
|
||||
-----END PGP SIGNATURE-----
|
||||
60
lvm2.spec
60
lvm2.spec
@ -1,6 +1,10 @@
|
||||
%define device_mapper_version 1.02.68
|
||||
%define enable_cluster 1
|
||||
%define device_mapper_version 1.02.69
|
||||
|
||||
%define enable_thin 0
|
||||
%define enable_cluster 1
|
||||
%define enable_openais 1
|
||||
%define enable_cmirror 1
|
||||
%define enable_udev 1
|
||||
|
||||
%if "%{fedora}" == "12"
|
||||
%define enable_systemd 0
|
||||
@ -9,39 +13,59 @@
|
||||
%else
|
||||
%if "%{fedora}" == "13"
|
||||
%define enable_systemd 0
|
||||
%define enable_udev 1
|
||||
%define udev_version 153-1
|
||||
%define configure_default_data_alignment --with-default-data-alignment=0
|
||||
%else
|
||||
%if "%{fedora}" == "14"
|
||||
%define enable_systemd 0
|
||||
%define enable_udev 1
|
||||
%define udev_version 158-1
|
||||
%else
|
||||
%if "%{fedora}" == "15"
|
||||
%define enable_systemd 1
|
||||
%define udev_version 158-1
|
||||
%else
|
||||
%if "%{fedora}" == "16"
|
||||
%define enable_systemd 1
|
||||
%define udev_version 158-1
|
||||
%else
|
||||
%define enable_systemd 1
|
||||
%define enable_udev 1
|
||||
%define enable_cmirror 0
|
||||
%define udev_version 158-1
|
||||
%define enable_thin 1
|
||||
%define enable_openais 0
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{enable_cluster}
|
||||
%if %{enable_cmirror}
|
||||
%define configure_cmirror --enable-cmirrord
|
||||
%else
|
||||
%define configure_cmirror --disable-cmirrord
|
||||
%endif
|
||||
%if %{enable_openais}
|
||||
%define corosync_version 1.2.0-1
|
||||
%define openais_version 1.1.1-1
|
||||
%define clusterlib_version 3.0.6-1
|
||||
%define configure_cluster --with-cluster=internal --with-clvmd=cman,openais,corosync --enable-cmirrord
|
||||
%define configure_cluster --with-cluster=internal --with-clvmd=cman,openais,corosync
|
||||
%else
|
||||
%define configure_cluster --with-cluster=internal --with-clvmd=none --disable-cmirrord
|
||||
%define corosync_version 1.99.1-1
|
||||
%define configure_cluster --with-cluster=internal --with-clvmd=corosync
|
||||
%else
|
||||
%define configure_cluster --with-cluster=internal --with-clvmd=none
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
||||
# Do not reset Release to 1 unless both lvm2 and device-mapper
|
||||
# versions are increased together.
|
||||
|
||||
Summary: Userland logical volume management tools
|
||||
Name: lvm2
|
||||
Version: 2.02.89
|
||||
Release: 2%{?dist}
|
||||
Version: 2.02.90
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2
|
||||
Group: System Environment/Base
|
||||
URL: http://sources.redhat.com/lvm2
|
||||
@ -56,9 +80,11 @@ BuildRequires: ncurses-devel
|
||||
BuildRequires: readline-devel
|
||||
%if %{enable_cluster}
|
||||
BuildRequires: corosynclib-devel >= %{corosync_version}
|
||||
%if %{enable_openais}
|
||||
BuildRequires: openaislib-devel >= %{openais_version}
|
||||
BuildRequires: clusterlib-devel >= %{clusterlib_version}
|
||||
%endif
|
||||
%endif
|
||||
BuildRequires: module-init-tools
|
||||
BuildRequires: pkgconfig
|
||||
%if %{enable_udev}
|
||||
@ -106,7 +132,7 @@ or more physical volumes and creating one or more logical volumes
|
||||
%define configure_thin --with-thin=internal
|
||||
%endif
|
||||
|
||||
%configure --enable-lvm1_fallback --enable-fsadm --with-pool=internal --with-user= --with-group= --with-usrlibdir=/usr/%{_lib} --with-usrsbindir=/usr/sbin --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib --enable-dmeventd %{configure_cluster} %{?configure_udev} %{?configure_default_data_alignment} %{?configure_thin}
|
||||
%configure --enable-lvm1_fallback --enable-fsadm --with-pool=internal --with-user= --with-group= --with-usrlibdir=/usr/%{_lib} --with-usrsbindir=/usr/sbin --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib --enable-dmeventd %{configure_cluster} %{configure_cmirror} %{?configure_udev} %{?configure_default_data_alignment} %{?configure_thin}
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
||||
@ -346,8 +372,10 @@ Requires(preun): chkconfig
|
||||
Requires(preun): device-mapper >= %{device_mapper_version}
|
||||
Requires(preun): lvm2 >= 2.02
|
||||
Requires: corosync >= %{corosync_version}
|
||||
%if %{enable_openais}
|
||||
Requires: openais >= %{openais_version}
|
||||
Requires: cman >= %{clusterlib_version}
|
||||
%endif
|
||||
|
||||
%description cluster
|
||||
|
||||
@ -376,6 +404,7 @@ fi
|
||||
# Cluster mirror subpackage
|
||||
##############################################################################
|
||||
%if %{enable_cluster}
|
||||
%if %{enable_cmirror}
|
||||
|
||||
%package -n cmirror
|
||||
Summary: Daemon for device-mapper-based clustered mirrors
|
||||
@ -404,6 +433,7 @@ fi
|
||||
%{_sysconfdir}/rc.d/init.d/cmirrord
|
||||
#%ghost %{_localstatedir}/run/cmirrord.pid
|
||||
|
||||
%endif
|
||||
%endif
|
||||
|
||||
##############################################################################
|
||||
@ -596,6 +626,16 @@ the device-mapper event library.
|
||||
/usr%{_libdir}/pkgconfig/devmapper-event.pc
|
||||
|
||||
%changelog
|
||||
* Wed Feb 1 2012 Alasdair Kergon <agk@redhat.com> - 2.02.90-1
|
||||
- Drop support for cman, openais and cmirror for f17.
|
||||
- Automatically detect whether corosync clvmd needs to use confdb or cmap.
|
||||
- Disable partial activation for thin LVs and LVs with all missing segments.
|
||||
- sync_local_dev_names before (re)activating mirror log for initialisation.
|
||||
- Do not print warning for pv_min_size between 512KB and 2MB.
|
||||
- Clean up systemd unit ordering and requirements.
|
||||
- Allow ALLOC_NORMAL to track reserved extents for log and data on same PV.
|
||||
- Fix data% report for thin volume used as origin for non-thin snapshot.
|
||||
|
||||
* Thu Jan 26 2012 Alasdair Kergon <agk@redhat.com> - 2.02.89-2
|
||||
- New upstream release with experimental support for thinly-provisioned devices.
|
||||
- The changelog for this release is quite long and contained in
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
52a6ee1b8f3cd0f377ada1b1981594ba LVM2.2.02.89.tgz
|
||||
56ca3f2c818d56dc6563fc36a8b6f1d5 LVM2.2.02.90.tgz
|
||||
|
||||
Loading…
Reference in New Issue
Block a user