prajnoha pushed to lvm2 (master). "New upstream lvm2 release v2.02.120. (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon May 18 13:21:50 UTC 2015
From 3749708b7c7f6ccc9f9c015d14c87233ea0324a8 Mon Sep 17 00:00:00 2001
From: Peter Rajnoha <prajnoha at redhat.com>
Date: Mon, 18 May 2015 15:21:23 +0200
Subject: New upstream lvm2 release v2.02.120.
Including lvmpolld and versions libdm symbols.
diff --git a/.gitignore b/.gitignore
index e710e30..d0c54f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
/LVM2.2.02.116.tgz
/LVM2.2.02.118.tgz
/LVM2.2.02.119.tgz
+/LVM2.2.02.120.tgz
diff --git a/LVM2.2.02.119.tgz.asc b/LVM2.2.02.119.tgz.asc
deleted file mode 100644
index 8b92c74..0000000
--- a/LVM2.2.02.119.tgz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEABECAAYFAlVEHgMACgkQIoGRwVZ+LBcbPACg3ajbXrepK0o8IFgB+VCRzFH7
-VhUAoMivFvC5JmzFenPMyMU9kbXNuNTw
-=+26S
------END PGP SIGNATURE-----
diff --git a/LVM2.2.02.120.tgz.asc b/LVM2.2.02.120.tgz.asc
new file mode 100644
index 0000000..671c4b4
--- /dev/null
+++ b/LVM2.2.02.120.tgz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEABECAAYFAlVWcqQACgkQIoGRwVZ+LBeiKgCg6vIAWhC7AZcf01Qf505sty3A
+HOwAoJGo8JYHscwGMo3FSIkLWHjbcRq0
+=96gn
+-----END PGP SIGNATURE-----
diff --git a/lvm2-enable-lvmetad-by-default.patch b/lvm2-enable-lvmetad-by-default.patch
deleted file mode 100644
index 24f8f28..0000000
--- a/lvm2-enable-lvmetad-by-default.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- conf/example.conf.in | 2 +-
- lib/config/config_settings.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/conf/example.conf.in b/conf/example.conf.in
-index c1a8f03..98a5f42 100644
---- a/conf/example.conf.in
-+++ b/conf/example.conf.in
-@@ -820,7 +820,7 @@ global {
- # lvmetad is not compatible with locking_type 3 (clustering).
- # LVM prints warnings and ignores lvmetad if this combination
- # is seen.
-- use_lvmetad = 0
-+ use_lvmetad = 1
-
- # Configuration option global/thin_check_executable.
- # The full path to the thin_check command.
-diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
-index 31609d4..35cb04d 100644
---- a/lib/config/config_settings.h
-+++ b/lib/config/config_settings.h
-@@ -780,7 +780,7 @@ cfg(global_lvdisplay_shows_full_device_path_CFG, "lvdisplay_shows_full_device_pa
- "was never a valid path in the /dev filesystem.\n"
- "Enable this option to reinstate the previous format.\n")
-
--cfg(global_use_lvmetad_CFG, "use_lvmetad", global_CFG_SECTION, 0, CFG_TYPE_BOOL, 0, vsn(2, 2, 93), NULL, 0, NULL,
-+cfg(global_use_lvmetad_CFG, "use_lvmetad", global_CFG_SECTION, 0, CFG_TYPE_BOOL, 1, vsn(2, 2, 93), NULL, 0, NULL,
- "Use lvmetad to cache metadata and reduce disk scanning.\n"
- "When enabled (and running), lvmetad provides LVM commands\n"
- "with VG metadata and PV state. LVM commands then avoid\n"
diff --git a/lvm2-set-default-preferred_names.patch b/lvm2-set-default-preferred_names.patch
index 77e19c3..a574fd2 100644
--- a/lvm2-set-default-preferred_names.patch
+++ b/lvm2-set-default-preferred_names.patch
@@ -1,31 +1,30 @@
- conf/example.conf.in | 3 +--
+ conf/example.conf.in | 2 +-
lib/config/config_settings.h | 2 +-
- 2 files changed, 2 insertions(+), 3 deletions(-)
+ 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/conf/example.conf.in b/conf/example.conf.in
-index c1a8f03..2b04496 100644
+index e809488..cebf464 100644
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
-@@ -91,8 +91,7 @@ devices {
- # Rule 4 prefers the path with least value in lexicographical order.
+@@ -92,7 +92,7 @@ devices {
# Example:
# preferred_names = [ "^/dev/mpath/", "^/dev/mapper/mpath", "^/dev/[hs]d" ]
-- # This configuration option does not have a default value defined.
+ # This configuration option does not have a default value defined.
- # preferred_names=[]
-+ preferred_names = [ "^/dev/mpath/", "^/dev/mapper/mpath", "^/dev/[hs]d" ]
++ preferred_names=[ "^/dev/mpath/", "^/dev/mapper/mpath", "^/dev/[hs]d" ]
# Configuration option devices/filter.
# Limit the block devices that are used by LVM commands.
diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
-index 31609d4..ac5cf5f 100644
+index 885a2fa..97cf3b3 100644
--- a/lib/config/config_settings.h
+++ b/lib/config/config_settings.h
-@@ -186,7 +186,7 @@ cfg(devices_external_device_info_source_CFG, "external_device_info_source", devi
+@@ -202,7 +202,7 @@ cfg(devices_external_device_info_source_CFG, "external_device_info_source", devi
"udev - Reuse existing udev database records. Applicable\n"
"only if LVM is compiled with udev support.\n")
--cfg_array(devices_preferred_names_CFG, "preferred_names", devices_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(1, 2, 19), NULL, 0, NULL,
-+cfg_array(devices_preferred_names_CFG, "preferred_names", devices_CFG_SECTION, CFG_ALLOW_EMPTY, CFG_TYPE_STRING, "#S^/dev/mpath/#S^/dev/mapper/mpath#S/dev/[hs]d", vsn(1, 2, 19), NULL, 0, NULL,
+-cfg_array(devices_preferred_names_CFG, "preferred_names", devices_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED , CFG_TYPE_STRING, NULL, vsn(1, 2, 19), NULL, 0, NULL,
++cfg_array(devices_preferred_names_CFG, "preferred_names", devices_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED , CFG_TYPE_STRING, "S^/dev/mpath/#S^/dev/mapper/mpath#S/dev/[hs]d", vsn(1, 2, 19), NULL, 0, NULL,
"Select which path name to display for a block device.\n"
"If multiple path names exist for a block device,\n"
"and LVM needs to display a name for the device,\n"
diff --git a/lvm2.spec b/lvm2.spec
index 61fa3cd..17e86cf 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -1,9 +1,10 @@
-%define device_mapper_version 1.02.96
+%define device_mapper_version 1.02.97
%define enable_cache 1
%define enable_cluster 1
%define enable_cmirror 1
%define enable_lvmetad 1
+%define enable_lvmpolld 1
%define enable_python 1
%define enable_thin 1
@@ -39,15 +40,14 @@
Summary: Userland logical volume management tools
Name: lvm2
-Version: 2.02.119
+Version: 2.02.120
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
URL: http://sources.redhat.com/lvm2
Source0: ftp://sources.redhat.com/pub/lvm2/releases/LVM2.%{version}.tgz
Patch0: lvm2-set-default-preferred_names.patch
-Patch1: lvm2-enable-lvmetad-by-default.patch
-Patch2: lvm2-remove-mpath-device-handling-from-udev-rules.patch
+Patch1: lvm2-remove-mpath-device-handling-from-udev-rules.patch
BuildRequires: libselinux-devel >= %{libselinux_version}, libsepol-devel
BuildRequires: libblkid-devel >= %{util_linux_version}
@@ -90,8 +90,7 @@ or more physical volumes and creating one or more logical volumes
%prep
%setup -q -n LVM2.%{version}
%patch0 -p1 -b .preferred_names
-%patch1 -p1 -b .enable_lvmetad
-%patch2 -p1 -b .udev_no_mpath
+%patch1 -p1 -b .udev_no_mpath
%build
%define _default_pid_dir /run
@@ -116,12 +115,16 @@ or more physical volumes and creating one or more logical volumes
%define configure_lvmetad --enable-lvmetad
%endif
+%if %{enable_lvmpolld}
+%define configure_lvmpolld --enable-lvmpolld
+%endif
+
%if %{enable_python}
%define configure_python --enable-python-bindings
%define configure_python3_flags PYTHON=/usr/bin/python3 PYTHON_CONFIG=/usr/bin/python3-config
%endif
-%define configure_final --with-default-dm-run-dir=%{_default_dm_run_dir} --with-default-run-dir=%{_default_run_dir} --with-default-pid-dir=%{_default_pid_dir} --with-default-locking-dir=%{_default_locking_dir} --with-usrlibdir=%{_libdir} --enable-lvm1_fallback --enable-fsadm --with-pool=internal --enable-write_install --with-user= --with-group= --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib --enable-dmeventd --enable-blkid_wiping %{?configure_python} %{?configure_cluster} %{?configure_cmirror} %{?configure_udev} %{?configure_thin} %{?configure_lvmetad} %{?configure_cache}
+%define configure_final --with-default-dm-run-dir=%{_default_dm_run_dir} --with-default-run-dir=%{_default_run_dir} --with-default-pid-dir=%{_default_pid_dir} --with-default-locking-dir=%{_default_locking_dir} --with-usrlibdir=%{_libdir} --enable-lvm1_fallback --enable-fsadm --with-pool=internal --enable-write_install --with-user= --with-group= --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib --enable-dmeventd --enable-blkid_wiping %{?configure_python} %{?configure_cluster} %{?configure_cmirror} %{?configure_udev} %{?configure_thin} %{?configure_lvmetad} %{?configure_cache} %{?configure_lvmpolld}
%if %{enable_python}
rm -rf %{py3dir}
@@ -162,18 +165,30 @@ rm -rf $RPM_BUILD_ROOT
%systemd_post lvm2-lvmetad.socket
%endif
+%if %{enable_lvmpolld}
+%systemd_post lvm2-lvmpolld.socket
+%endif
+
%preun
%systemd_preun blk-availability.service lvm2-monitor.service
%if %{enable_lvmetad}
%systemd_preun lvm2-lvmetad.service lvm2-lvmetad.socket
%endif
+%if %{enable_lvmpolld}
+%systemd_preun lvm2-lvmpolld.service lvm2-lvmpolld.socket
+%endif
+
%postun
%systemd_postun lvm2-monitor.service
%if %{enable_lvmetad}
%systemd_postun_with_restart lvm2-lvmetad.service
%endif
+%if %{enable_lvmpolld}
+%systemd_postun_with_restart lvm2-lvmpolld.service
+%endif
+
%triggerun -- %{name} < 2.02.86-2
%{_bindir}/systemd-sysv-convert --save lvm2-monitor >/dev/null 2>&1 || :
/bin/systemctl --no-reload enable lvm2-monitor.service > /dev/null 2>&1 || :
@@ -197,6 +212,9 @@ rm -rf $RPM_BUILD_ROOT
%if %{enable_lvmetad}
%{_sbindir}/lvmetad
%endif
+%if %{enable_lvmpolld}
+%{_sbindir}/lvmpolld
+%endif
%{_sbindir}/vgimportclone
# Other files
@@ -303,6 +321,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/lvmetad.8.gz
%{_udevdir}/69-dm-lvm-metad.rules
%endif
+%if %{enable_lvmpolld}
+%{_mandir}/man8/lvmpolld.8.gz
+%endif
%dir %{_sysconfdir}/lvm
%ghost %{_sysconfdir}/lvm/cache/.cache
%attr(644, -, -) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lvm/lvm.conf
@@ -326,6 +347,10 @@ rm -rf $RPM_BUILD_ROOT
%{_unitdir}/lvm2-lvmetad.service
%{_unitdir}/lvm2-pvscan at .service
%endif
+%if %{enable_lvmpolld}
+%{_unitdir}/lvm2-lvmpolld.socket
+%{_unitdir}/lvm2-lvmpolld.service
+%endif
##############################################################################
# Library and Development subpackages
diff --git a/sources b/sources
index b056e8c..4b0a059 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-93d15d76ab78fbcec4721c4b44284bbb LVM2.2.02.119.tgz
+326df8542d3a2376da907e98a0888ccf LVM2.2.02.120.tgz
diff --git a/upstream b/upstream
index b216178..825478f 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-LVM2.2.02.119.tgz
+LVM2.2.02.120.tgz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/lvm2.git/commit/?h=master&id=3749708b7c7f6ccc9f9c015d14c87233ea0324a8
More information about the scm-commits
mailing list