diff --git a/lvm2-do-not-strip-pdata_tools.patch b/lvm2-do-not-strip-pdata_tools.patch deleted file mode 100644 index 5307838..0000000 --- a/lvm2-do-not-strip-pdata_tools.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: LVM2.2.02.114/thin-provisioning-tools-0.4.1/Makefile.in -=================================================================== ---- LVM2.2.02.114.orig/thin-provisioning-tools-0.4.1/Makefile.in -+++ LVM2.2.02.114/thin-provisioning-tools-0.4.1/Makefile.in -@@ -108,7 +108,7 @@ MANPATH:=$(DATADIR)/man - vpath %.cc $(TOP_DIR) - - INSTALL_DIR = $(INSTALL) -m 755 -d --INSTALL_PROGRAM = $(INSTALL) -m 755 -s -+INSTALL_PROGRAM = $(INSTALL) -m 755 - INSTALL_DATA = $(INSTALL) -p -m 644 - - ifeq ("@TESTING@", "yes") diff --git a/lvm2.changes b/lvm2.changes index 7dee22c..64a83eb 100644 --- a/lvm2.changes +++ b/lvm2.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Jul 27 19:35:15 UTC 2015 - mpluskal@suse.com + +- Update thin-provisioning tools to 0.5.3 + * Fix bug where the tools would crash if given a very large + metadata device to restore to. + * - thin_delta, thin_trim + * --clear-needs-check flag for cache_check + * space map checking for thin check +- Drop unnecessary lvm2-do-not-strip-pdata_tools.patch + +------------------------------------------------------------------- +Fri Jul 24 13:16:09 UTC 2015 - dvaleev@suse.com + +- Allow building without clvm (boo#923127) + Keep clvm2 building by default + ------------------------------------------------------------------- Tue Jul 14 09:05:13 UTC 2015 - lwang@suse.com diff --git a/lvm2.spec b/lvm2.spec index e8c4314..342c639 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -1,7 +1,7 @@ # # spec file for package lvm2 # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,9 @@ %define lvm2_version 2.02.120 %define device_mapper_version 1.02.97 -%define thin_provisioning_version 0.4.1 +%define thin_provisioning_version 0.5.3 + +%bcond_without clvm Name: lvm2 Version: %{lvm2_version} @@ -86,7 +88,6 @@ Patch2004: udev_rules-update.diff #suse, bnc#875233 Patch2005: udev-Check-for-DM_NR_VALID_PATHS.patch # suse, boo#910327 -Patch2006: lvm2-do-not-strip-pdata_tools.patch Patch2007: fsadm-add-support-for-btrfs.patch Patch2008: Import-ID_FS_XXX-variables-bnc909358.patch Patch2009: 10-dm.rules-Reset-state-variable-for-spurious-events.patch @@ -140,7 +141,9 @@ Volume Manager. %patch1013 -p1 %patch1014 -p1 %patch1015 -p1 +%if %{with clvm} %patch1016 -p1 +%endif %patch1017 -p1 %patch1018 -p1 @@ -150,7 +153,6 @@ Volume Manager. %patch2003 -p1 %patch2004 -p1 %patch2005 -p1 -%patch2006 -p1 %patch2007 -p1 %patch2008 -p1 %patch2009 -p1 @@ -179,12 +181,14 @@ autoreconf -fvi --enable-realtime \ --enable-pkgconfig \ --enable-selinux \ +%if %{with clvm} --with-clvmd=corosync \ --with-cluster=internal \ - --datarootdir="%_datadir" \ - --with-default-locking-dir=/run/lock/lvm \ --enable-cmirrord \ +%endif + --datarootdir="%_datadir" \ --enable-lvmetad \ + --with-default-locking-dir=/run/lock/lvm \ --with-default-pid-dir=/run \ --with-default-dm-run-dir=/run \ --with-default-run-dir=/run/lvm \ @@ -203,10 +207,12 @@ export SUSE_ASNEEDED=0 make %{?_smp_mflags} +%if %{with clvm} #csm convert pushd bnz make %{?_smp_mflags} popd +%endif pushd thin-provisioning-tools-%{thin_provisioning_version} autoreconf -fiv @@ -225,9 +231,18 @@ install -d -m 755 "%buildroot/%_sysconfdir/lvm/metadata" install -m 644 %{SOURCE1} "%buildroot/%_sysconfdir/lvm/" mkdir -p "%buildroot/%_initddir" mkdir -p "%buildroot/%_sbindir" +%if %{with clvm} install -m755 -D %{S:8} "%buildroot/%_prefix/lib/ocf/resource.d/lvm2/clvmd" install -m755 -D %{S:10} "%buildroot/%_prefix/lib/ocf/resource.d/lvm2/cmirrord" +#csm-convert +pushd bnz +install -m755 -D csm-converter "%buildroot/%_sbindir/csm-converter" +install -m755 -D csm-converter-helper "%buildroot/%_sbindir/csm-converter-helper" +mv README.csm-converter .. +popd +%endif + # Make sure libdevmapper.so.1.02 libdevmapper-event.so.1.02 still available # on Tumbleweed, as virtualbox.org didn't update their RPMs yet. rm -f libdm/ioctl/libdevmapper.so daemons/dmeventd/libdevmapper-event.so @@ -248,13 +263,6 @@ pushd "%buildroot/%_sbindir" ln -sf ../../sbin/lvm lvm popd -#csm-convert -pushd bnz -install -m755 -D csm-converter "%buildroot/%_sbindir/csm-converter" -install -m755 -D csm-converter-helper "%buildroot/%_sbindir/csm-converter-helper" -mv README.csm-converter .. -popd - pushd thin-provisioning-tools-%{thin_provisioning_version} %make_install popd @@ -326,6 +334,7 @@ popd %_mandir/man8/vg*.8* %_mandir/man7/lvm*.7* +%if %{with clvm} %package clvm Url: http://sources.redhat.com/cluster/clvm/ Version: %{lvm2_version} @@ -403,6 +412,7 @@ A daemon for using LVM2 Logival Volumes in a clustered environment. /usr/lib/ocf/resource.d/lvm2/cmirrord %{_mandir}/man8/cmirrord.8.gz /usr/lib/systemd/system/lvm2-cmirrord.service +%endif %package devel Version: %{lvm2_version} diff --git a/thin-provisioning-tools-v0.4.1.tar.gz b/thin-provisioning-tools-v0.4.1.tar.gz deleted file mode 100644 index d5ea15d..0000000 --- a/thin-provisioning-tools-v0.4.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:59c8a787df8d4828bf9ca1b6310584f2b7723068901e20aa609015ce85df1d46 -size 186979 diff --git a/thin-provisioning-tools-v0.5.3.tar.gz b/thin-provisioning-tools-v0.5.3.tar.gz new file mode 100644 index 0000000..88555ee --- /dev/null +++ b/thin-provisioning-tools-v0.5.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d6856dbca2f0fcf23ece171a8e68a4a7054350a3810958da37615358695597e +size 191431