diff --git a/Makefile-skip-compliling-daemons-lvmlockd-directory.patch b/Makefile-skip-compliling-daemons-lvmlockd-directory.patch new file mode 100644 index 0000000..ee30c3a --- /dev/null +++ b/Makefile-skip-compliling-daemons-lvmlockd-directory.patch @@ -0,0 +1,47 @@ +From f977d86dfea51a09eed1787071676e1d45a8f2f4 Mon Sep 17 00:00:00 2001 +From: Eric Ren +Date: Tue, 16 May 2017 15:26:54 +0800 +Subject: [PATCH] build: skip compliling daemons/lvmlockd directory + +bsc#1037309 + +Signed-off-by: Eric Ren +--- + configure | 3 ++- + daemons/Makefile.in | 6 +++--- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 4b8311848..cb4d790de 100755 +--- a/configure ++++ b/configure +@@ -11772,7 +11772,8 @@ test -n "$LVMPOLLD" && BUILD_LVMPOLLD=$LVMPOLLD + $as_echo "$BUILD_LVMPOLLD" >&6; } + + ################################################################################ +-BUILD_LVMLOCKD=no ++# BUILD_LVMLOCKD=no ++BUILD_LVMLOCKD=yes + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build lockdsanlock" >&5 + $as_echo_n "checking whether to build lockdsanlock... " >&6; } +diff --git a/daemons/Makefile.in b/daemons/Makefile.in +index ebbd740ef..58d5fef94 100644 +--- a/daemons/Makefile.in ++++ b/daemons/Makefile.in +@@ -40,9 +40,9 @@ ifeq ("@BUILD_LVMPOLLD@", "yes") + SUBDIRS += lvmpolld + endif + +-ifeq ("@BUILD_LVMLOCKD@", "yes") +- SUBDIRS += lvmlockd +-endif ++# ifeq ("@BUILD_LVMLOCKD@", "yes") ++# SUBDIRS += lvmlockd ++# endif + + ifeq ("@BUILD_LVMDBUSD@", "yes") + SUBDIRS += lvmdbusd +-- +2.12.0 + diff --git a/device-mapper.changes b/device-mapper.changes index 18941d2..9251457 100644 --- a/device-mapper.changes +++ b/device-mapper.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed May 17 08:21:27 UTC 2017 - zren@suse.com + +- Add lvmlockd-related configuration items in lvm.conf, fate#323203 + +------------------------------------------------------------------- +Tue May 16 07:45:25 UTC 2017 - zren@suse.com + +- Fix compiling issue of lvmlockd, bsc#1037309 + + Makefile-skip-compliling-daemons-lvmlockd-directory.patch + +------------------------------------------------------------------- +Fri May 5 11:33:28 UTC 2017 - tchvatal@suse.com + +- Remove comments breaking scriptlets: + * warning: %postun(libdevmapper1_03-1.02.137-5.1.x86_64) scriptlet failed + ------------------------------------------------------------------- Wed May 3 09:01:42 UTC 2017 - zren@suse.com diff --git a/device-mapper.spec b/device-mapper.spec index 2124f06..82c19b4 100644 --- a/device-mapper.spec +++ b/device-mapper.spec @@ -227,10 +227,6 @@ ln -s %{_sbindir}/dmsetup %{buildroot}/sbin/dmsetup %{_sbindir}/rcdm-event %{_unitdir}/dm-event.service -############################################################################## -# Library for device-mapper -############################################################################## - %package -n %{libname} Summary: Library for device-mapper Group: System/Libraries @@ -247,10 +243,6 @@ Device mapper main shared library %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig -############################################################################## -# Event library for device-mapper -############################################################################## - %package -n %{libname_event} Summary: Event library for device-mapper Group: System/Libraries @@ -267,10 +259,6 @@ Device mapper event daemon shared library %post -n %{libname_event} -p /sbin/ldconfig %postun -n %{libname_event} -p /sbin/ldconfig -############################################################################## -# Development package for the device mapper -############################################################################## - %package devel Summary: Development package for the device mapper Group: Development/Libraries/C and C++ diff --git a/lvm.conf b/lvm.conf index d88fe23..126a79a 100644 --- a/lvm.conf +++ b/lvm.conf @@ -688,6 +688,30 @@ global { # If use_lvmetad set to 1, please make sure lvm2-lvmetad.socket is started use_lvmetad = 1 + # Configuration option global/use_lvmlockd. + # Use lvmlockd for locking among hosts using LVM on shared storage. + # Applicable only if LVM is compiled with lockd support in which + # case there is also lvmlockd(8) man page available for more + # information. + use_lvmlockd = 0 + + # Configuration option global/lvmlockd_lock_retries. + # Retry lvmlockd lock requests this many times. + # Applicable only if LVM is compiled with lockd support + # This configuration option has an automatic default value. + # lvmlockd_lock_retries = 3 + + # Configuration option global/sanlock_lv_extend. + # Size in MiB to extend the internal LV holding sanlock locks. + # The internal LV holds locks for each LV in the VG, and after enough + # LVs have been created, the internal LV needs to be extended. lvcreate + # will automatically extend the internal LV when needed by the amount + # specified here. Setting this to 0 disables the automatic extension + # and can cause lvcreate to fail. Applicable only if LVM is compiled + # with lockd support + # This configuration option has an automatic default value. + # sanlock_lv_extend = 256 + # Full path of the utility called to check that a thin metadata device # is in a state that allows it to be used. # Each time a thin pool needs to be activated or after it is deactivated diff --git a/lvm2-clvm.changes b/lvm2-clvm.changes index 18941d2..9251457 100644 --- a/lvm2-clvm.changes +++ b/lvm2-clvm.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed May 17 08:21:27 UTC 2017 - zren@suse.com + +- Add lvmlockd-related configuration items in lvm.conf, fate#323203 + +------------------------------------------------------------------- +Tue May 16 07:45:25 UTC 2017 - zren@suse.com + +- Fix compiling issue of lvmlockd, bsc#1037309 + + Makefile-skip-compliling-daemons-lvmlockd-directory.patch + +------------------------------------------------------------------- +Fri May 5 11:33:28 UTC 2017 - tchvatal@suse.com + +- Remove comments breaking scriptlets: + * warning: %postun(libdevmapper1_03-1.02.137-5.1.x86_64) scriptlet failed + ------------------------------------------------------------------- Wed May 3 09:01:42 UTC 2017 - zren@suse.com diff --git a/lvm2-clvm.spec b/lvm2-clvm.spec index 4ddb27d..c087819 100644 --- a/lvm2-clvm.spec +++ b/lvm2-clvm.spec @@ -236,10 +236,6 @@ rm %{buildroot}%{_unitdir}/lvm2-pvscan@.service %{_libexecdir}/systemd/lvm2-cluster-activation %{_mandir}/man8/clvmd.8%{ext_man} -############################################################################## -# Clustered RAID 1 support using device-mapper and corosync -############################################################################## - %package -n lvm2-cmirrord Summary: Clustered RAID 1 support using device-mapper and corosync Group: Productivity/Clustering/HA @@ -259,10 +255,6 @@ A daemon for using LVM2 Logival Volumes in a clustered environment. %{_sbindir}/rclvm2-cmirrord %{_mandir}/man8/cmirrord.8%{ext_man} -############################################################################## -# LVM locking daemon -############################################################################## - %package -n lvm2-lockd Summary: LVM locking daemon Group: Productivity/Clustering/HA diff --git a/lvm2.changes b/lvm2.changes index 18941d2..9251457 100644 --- a/lvm2.changes +++ b/lvm2.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed May 17 08:21:27 UTC 2017 - zren@suse.com + +- Add lvmlockd-related configuration items in lvm.conf, fate#323203 + +------------------------------------------------------------------- +Tue May 16 07:45:25 UTC 2017 - zren@suse.com + +- Fix compiling issue of lvmlockd, bsc#1037309 + + Makefile-skip-compliling-daemons-lvmlockd-directory.patch + +------------------------------------------------------------------- +Fri May 5 11:33:28 UTC 2017 - tchvatal@suse.com + +- Remove comments breaking scriptlets: + * warning: %postun(libdevmapper1_03-1.02.137-5.1.x86_64) scriptlet failed + ------------------------------------------------------------------- Wed May 3 09:01:42 UTC 2017 - zren@suse.com diff --git a/lvm2.spec b/lvm2.spec index e7b1bdd..30b9749 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -110,6 +110,9 @@ Patch2011: lvm2-testsuite.patch Patch2012: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch ### COMMON-PATCH-END ### +#bsc#1037309 +Patch2013: Makefile-skip-compliling-daemons-lvmlockd-directory.patch + %description Programs and man pages for configuring and using the LVM2 Logical Volume Manager. @@ -146,6 +149,8 @@ Volume Manager. %patch2012 -p1 ### COMMON-PREP-END ### +%patch2013 -p1 + %build extra_opts=" --enable-applib @@ -232,6 +237,11 @@ rm %{buildroot}%{_libdir}/libdevmapper.so rm %{buildroot}%{_libdir}/libdevmapper-event.so rm %{buildroot}%{_includedir}/libdevmapper*.h rm %{buildroot}%{_libdir}/pkgconfig/devmapper*.pc +# See bsc#1037309 for more info +rm %{buildroot}%{_unitdir}/lvm2-lvmlockd.service +rm %{buildroot}%{_unitdir}/lvm2-lvmlocking.service +rm %{buildroot}%{_mandir}/man8/lvmlockctl.8 +rm %{buildroot}%{_mandir}/man8/lvmlockd.8 # compat symlinks in /sbin remove with Leap 43 mkdir -p %{buildroot}/sbin @@ -465,10 +475,6 @@ popd %{_libdir}/libdevmapper-event-lvm2*.so %{_libdir}/libdevmapper-event-lvm2*.so.2.02 -############################################################################## -# LVM2 application api library -############################################################################## - %package -n %{applib} Summary: LVM2 application api library Group: System/Libraries @@ -484,10 +490,6 @@ LVM library for applications api %defattr(-,root,root) %{_libdir}/liblvm2app.so.* -############################################################################## -# LVM2 command line library -############################################################################## - %package -n %{cmdlib} Summary: LVM2 command line library Group: System/Libraries @@ -504,10 +506,6 @@ lvm devices without invoking a separate program. %defattr(-,root,root) %{_libdir}/liblvm2cmd.so.* -############################################################################## -# Development files for LVM2 -############################################################################## - %package devel Summary: Development files for LVM2 Group: Development/Libraries/C and C++ @@ -527,10 +525,6 @@ This package provides development files for the LVM2 Logical Volume Manager. %{_libdir}/liblvm2app.so %{_libdir}/liblvm2cmd.so -############################################################################## -# LVM2 Testsuite -############################################################################## - %package testsuite Summary: LVM2 Testsuite Group: Development/Libraries/C and C++