Accepting request 400646 from home:scarabeus_iv:branches:Base:System

- Add thin-provisioning-tools to deps to fix configure warnings

- Do not run initrd regenerating twice in post

- Update to 2.02.155 release, read WHATS_NEW for detailed log.
  * Mostly few bugfixes around caching
- Refresh patch pvmove_support_clustered_vg.diff

- Add thin-provisioning-tools to deps to fix configure warnings

- Do not run initrd regenerating twice in post

- Update to 2.02.155 release, read WHATS_NEW for detailed log.
  * Mostly few bugfixes around caching
- Refresh patch pvmove_support_clustered_vg.diff

- Add thin-provisioning-tools to deps to fix configure warnings

- Do not run initrd regenerating twice in post

- Update to 2.02.155 release, read WHATS_NEW for detailed log.
  * Mostly few bugfixes around caching
- Refresh patch pvmove_support_clustered_vg.diff

OBS-URL: https://build.opensuse.org/request/show/400646
OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=154
This commit is contained in:
Marcus Meissner 2016-06-14 12:45:57 +00:00 committed by Git OBS Bridge
parent 40dea6f79c
commit f2dca905c9
11 changed files with 83 additions and 33 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2a7ff6252c8d024f27d4bfc881bf6162198c806d2b75ea166f2797b573be7b4d
size 2008985

View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
iEYEABECAAYFAlcj+EIACgkQIoGRwVZ+LBeYrACg7dMTMM+3IO9hW9a9Aj4EObtb
MKoAnjnQ4654ujnNbrwFWF3QaFhIkIXn
=qaPB
-----END PGP SIGNATURE-----

3
LVM2.2.02.155.tgz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e8e6ede6034e45d432e5ccdfd60632f7e71c59bb6a7270a5990f4101841b156e
size 2021197

7
LVM2.2.02.155.tgz.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
iEYEABECAAYFAldSA0MACgkQIoGRwVZ+LBe5AgCg1ReoabJaM1fBerB9UQzUYSEX
93wAoOzm92DOF3ZSjVNNN+s6Vr/rN+Le
=5j5T
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Tue Jun 7 12:08:24 UTC 2016 - tchvatal@suse.com
- Add thin-provisioning-tools to deps to fix configure warnings
-------------------------------------------------------------------
Tue Jun 7 11:45:56 UTC 2016 - tchvatal@suse.com
- Do not run initrd regenerating twice in post
-------------------------------------------------------------------
Tue Jun 7 11:40:41 UTC 2016 - tchvatal@suse.com
- Update to 2.02.155 release, read WHATS_NEW for detailed log.
* Mostly few bugfixes around caching
- Refresh patch pvmove_support_clustered_vg.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 19 12:07:09 UTC 2016 - tchvatal@suse.com Thu May 19 12:07:09 UTC 2016 - tchvatal@suse.com

View File

@ -17,8 +17,8 @@
### COMMON-DEF-BEGIN ### ### COMMON-DEF-BEGIN ###
%define lvm2_version 2.02.152 %define lvm2_version 2.02.155
%define device_mapper_version 1.02.124 %define device_mapper_version 1.02.126
### COMMON-DEF-END ### ### COMMON-DEF-END ###
%define libname libdevmapper1_03 %define libname libdevmapper1_03
%define libname_event libdevmapper-event1_03 %define libname_event libdevmapper-event1_03
@ -74,8 +74,9 @@ Patch2007: 10-dm.rules-Reset-state-variable-for-spurious-events.patch
Patch2008: libdm-iface-not-output-error-message-inside-retry-loop.patch Patch2008: libdm-iface-not-output-error-message-inside-retry-loop.patch
### COMMON-PATCH-END ### ### COMMON-PATCH-END ###
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkg-config BuildRequires: pkgconfig
BuildRequires: suse-module-tools BuildRequires: suse-module-tools
BuildRequires: thin-provisioning-tools >= 0.5.6
BuildRequires: pkgconfig(libselinux) BuildRequires: pkgconfig(libselinux)
BuildRequires: pkgconfig(libsepol) BuildRequires: pkgconfig(libsepol)
BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libudev)
@ -135,7 +136,6 @@ Files needed for software development using the device mapper
%patch1017 -p1 %patch1017 -p1
%patch1018 -p1 %patch1018 -p1
%patch1019 -p1 %patch1019 -p1
%patch2000 -p1 %patch2000 -p1
%patch2001 -p1 %patch2001 -p1
%patch2002 -p1 %patch2002 -p1

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Tue Jun 7 12:08:24 UTC 2016 - tchvatal@suse.com
- Add thin-provisioning-tools to deps to fix configure warnings
-------------------------------------------------------------------
Tue Jun 7 11:45:56 UTC 2016 - tchvatal@suse.com
- Do not run initrd regenerating twice in post
-------------------------------------------------------------------
Tue Jun 7 11:40:41 UTC 2016 - tchvatal@suse.com
- Update to 2.02.155 release, read WHATS_NEW for detailed log.
* Mostly few bugfixes around caching
- Refresh patch pvmove_support_clustered_vg.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 19 12:07:09 UTC 2016 - tchvatal@suse.com Thu May 19 12:07:09 UTC 2016 - tchvatal@suse.com

View File

@ -17,8 +17,8 @@
### COMMON-DEF-BEGIN ### ### COMMON-DEF-BEGIN ###
%define lvm2_version 2.02.152 %define lvm2_version 2.02.155
%define device_mapper_version 1.02.124 %define device_mapper_version 1.02.126
### COMMON-DEF-END ### ### COMMON-DEF-END ###
Name: lvm2-clvm Name: lvm2-clvm
Version: %{lvm2_version} Version: %{lvm2_version}
@ -75,6 +75,7 @@ Patch2008: libdm-iface-not-output-error-message-inside-retry-loop.patch
BuildRequires: libcorosync-devel BuildRequires: libcorosync-devel
BuildRequires: libdlm-devel BuildRequires: libdlm-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: thin-provisioning-tools >= 0.5.6
BuildRequires: pkgconfig(devmapper) BuildRequires: pkgconfig(devmapper)
BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libudev)
Requires: corosync Requires: corosync
@ -119,7 +120,6 @@ A daemon for using LVM2 Logival Volumes in a clustered environment.
%patch1017 -p1 %patch1017 -p1
%patch1018 -p1 %patch1018 -p1
%patch1019 -p1 %patch1019 -p1
%patch2000 -p1 %patch2000 -p1
%patch2001 -p1 %patch2001 -p1
%patch2002 -p1 %patch2002 -p1

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Tue Jun 7 12:08:24 UTC 2016 - tchvatal@suse.com
- Add thin-provisioning-tools to deps to fix configure warnings
-------------------------------------------------------------------
Tue Jun 7 11:45:56 UTC 2016 - tchvatal@suse.com
- Do not run initrd regenerating twice in post
-------------------------------------------------------------------
Tue Jun 7 11:40:41 UTC 2016 - tchvatal@suse.com
- Update to 2.02.155 release, read WHATS_NEW for detailed log.
* Mostly few bugfixes around caching
- Refresh patch pvmove_support_clustered_vg.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 19 12:07:09 UTC 2016 - tchvatal@suse.com Thu May 19 12:07:09 UTC 2016 - tchvatal@suse.com

View File

@ -17,8 +17,8 @@
### COMMON-DEF-BEGIN ### ### COMMON-DEF-BEGIN ###
%define lvm2_version 2.02.152 %define lvm2_version 2.02.155
%define device_mapper_version 1.02.124 %define device_mapper_version 1.02.126
### COMMON-DEF-END ### ### COMMON-DEF-END ###
%define _udevdir %(pkg-config --variable=udevdir udev) %define _udevdir %(pkg-config --variable=udevdir udev)
%define applib liblvm2app2_2 %define applib liblvm2app2_2
@ -77,10 +77,10 @@ Patch2008: libdm-iface-not-output-error-message-inside-retry-loop.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libaio-devel BuildRequires: libaio-devel
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
BuildRequires: pkg-config
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: readline-devel BuildRequires: readline-devel
BuildRequires: systemd BuildRequires: systemd
BuildRequires: thin-provisioning-tools >= 0.5.6
BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(udev) BuildRequires: pkgconfig(udev)
@ -144,7 +144,6 @@ This package provides development files for the LVM2 Logical Volume Manager.
%patch1017 -p1 %patch1017 -p1
%patch1018 -p1 %patch1018 -p1
%patch1019 -p1 %patch1019 -p1
%patch2000 -p1 %patch2000 -p1
%patch2001 -p1 %patch2001 -p1
%patch2002 -p1 %patch2002 -p1
@ -250,7 +249,6 @@ popd
%service_add_post blk-availability.service lvm2-monitor.service lvm2-lvmetad.socket lvm2-lvmetad.service %service_add_post blk-availability.service lvm2-monitor.service lvm2-lvmetad.socket lvm2-lvmetad.service
# Use %%tmpfiles_create when 13.2 is oldest in support scope # Use %%tmpfiles_create when 13.2 is oldest in support scope
/usr/bin/systemd-tmpfiles --create %{_tmpfilesdir}/lvm2.conf || : /usr/bin/systemd-tmpfiles --create %{_tmpfilesdir}/lvm2.conf || :
%{?regenerate_initrd_post}
%posttrans %posttrans
%{?regenerate_initrd_posttrans} %{?regenerate_initrd_posttrans}

View File

@ -2,9 +2,11 @@
lib/activate/activate.c | 30 ++++++++++++++++++++++++++++++ lib/activate/activate.c | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+) 1 file changed, 30 insertions(+)
--- LVM2.2.02.98.orig/lib/activate/activate.c Index: LVM2.2.02.155/lib/activate/activate.c
+++ LVM2.2.02.98/lib/activate/activate.c ===================================================================
@@ -569,6 +569,26 @@ int module_present(struct cmd_context *c --- LVM2.2.02.155.orig/lib/activate/activate.c
+++ LVM2.2.02.155/lib/activate/activate.c
@@ -621,6 +621,26 @@ int module_present(struct cmd_context *c
return ret; return ret;
} }
@ -28,13 +30,13 @@
+ return ret; + return ret;
+} +}
+ +
int target_present(struct cmd_context *cmd, const char *target_name, int target_present_version(struct cmd_context *cmd, const char *target_name,
int use_modprobe) int use_modprobe,
{ uint32_t *maj, uint32_t *min, uint32_t *patchlevel)
@@ -577,6 +597,16 @@ int target_present(struct cmd_context *c @@ -629,6 +649,15 @@ int target_present_version(struct cmd_co
if (!activation()) log_error(INTERNAL_ERROR "Target present version called when activation is disabled.");
return 0; return 0;
}
+ if (!strncmp(target_name, "log-userspace", 13)) { + if (!strncmp(target_name, "log-userspace", 13)) {
+ /* + /*
+ When the target_name is log-userspace, it also means + When the target_name is log-userspace, it also means
@ -44,7 +46,6 @@
+ log_error("cmirrord is required, but not running now."); + log_error("cmirrord is required, but not running now.");
+ return_0; + return_0;
+ } + }
+
#ifdef MODPROBE_CMD #ifdef MODPROBE_CMD
if (use_modprobe) { if (use_modprobe) {
if (target_version(target_name, &maj, &min, &patchlevel)) if (target_version(target_name, maj, min, patchlevel))