- Add 'lvm2-lockd' subpackage, fate#323203 to lvm2-clvm to not pull

corosync and other deps to the core lvm2 package

- Add 'lvm2-lockd' subpackage, fate#323203 to lvm2-clvm to not pull
  corosync and other deps to the core lvm2 package

- Add 'lvm2-lockd' subpackage, fate#323203 to lvm2-clvm to not pull
  corosync and other deps to the core lvm2 package

OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=176

device-mapper.changes

@@ -6,6 +6,12 @@ Mon Apr 10 10:41:02 UTC 2017 - tchvatal@suse.com
 - Enable internal cache
 - Enable lvmpolld
 
+-------------------------------------------------------------------
+Mon Apr 10 07:41:10 UTC 2017 - zren@suse.com
+
+- Add 'lvm2-lockd' subpackage, fate#323203 to lvm2-clvm to not pull
+  corosync and other deps to the core lvm2 package
+
 -------------------------------------------------------------------
 Fri Feb 24 10:57:16 UTC 2017 - zren@suse.com
 

lvm2-clvm.changes

@@ -6,6 +6,12 @@ Mon Apr 10 10:41:02 UTC 2017 - tchvatal@suse.com
 - Enable internal cache
 - Enable lvmpolld
 
+-------------------------------------------------------------------
+Mon Apr 10 07:41:10 UTC 2017 - zren@suse.com
+
+- Add 'lvm2-lockd' subpackage, fate#323203 to lvm2-clvm to not pull
+  corosync and other deps to the core lvm2 package
+
 -------------------------------------------------------------------
 Fri Feb 24 10:57:16 UTC 2017 - zren@suse.com
 

lvm2-clvm.spec

@@ -16,6 +16,8 @@
 #
 
 
+%define dlm_version     3.99.1
+%define sanlock_version 3.3.0
 ### COMMON-DEF-BEGIN ###
 %define lvm2_version              2.02.168
 %define device_mapper_version     1.02.137
@@ -33,9 +35,11 @@ Source1:        ftp://sources.redhat.com/pub/lvm2/LVM2.%{lvm2_version}.tgz.asc
 Source2:        clvmd.ocf
 Source3:        cmirrord.ocf
 BuildRequires:  libcorosync-devel
-BuildRequires:  libdlm-devel
+BuildRequires:  libdlm-devel >= %{dlm_version}
 BuildRequires:  pkgconfig
+BuildRequires:  sanlock-devel >= %{sanlock_version}
 BuildRequires:  thin-provisioning-tools >= %{thin_provisioning_version}
+BuildRequires:  pkgconfig(blkid)
 BuildRequires:  pkgconfig(devmapper)
 BuildRequires:  pkgconfig(libudev)
 Requires:       corosync
@@ -143,12 +147,20 @@ A daemon for using LVM2 Logival Volumes in a clustered environment.
 
 %build
 extra_opts="
+    --enable-applib
+    --enable-blkid_wiping
+    --enable-cmdlib
+    --enable-lvmetad
+    --enable-lvmpolld
+    --enable-realtime
     --with-default-locking-dir=/run/lock/lvm
     --with-default-pid-dir=/run
     --with-default-run-dir=/run/lvm
     --with-clvmd=corosync
     --with-cluster=internal
     --enable-cmirrord
+    --enable-lockd-dlm
+    --enable-lockd-sanlock
 "
 
 ### COMMON-CONFIG-BEGIN ###
@@ -183,8 +195,13 @@ make %{?_smp_mflags}
 make DESTDIR=%{buildroot} \
     install_cluster \
     install_systemd_units install_systemd_generators
+make DESTDIR=%{buildroot} install -C daemons/lvmlockd
 make DESTDIR=%{buildroot} install -C daemons/cmirrord
 
+# lvmlockd does not have separate target install the mans by hand for now
+install -m0644 -D man/lvmlockd.8 %{buildroot}%{_mandir}/man8/lvmlockd.8
+install -m0644 -D man/lvmlockctl.8 %{buildroot}%{_mandir}/man8/lvmlockctl.8
+
 # ocf files
 install -m755 -D %{SOURCE2} "%{buildroot}/%{_libexecdir}/ocf/resource.d/lvm2/clvmd"
 install -m755 -D %{SOURCE3} "%{buildroot}/%{_libexecdir}/ocf/resource.d/lvm2/cmirrord"
@@ -193,6 +210,8 @@ install -m755 -D %{SOURCE3} "%{buildroot}/%{_libexecdir}/ocf/resource.d/lvm2/cmi
 ln -s service %{buildroot}%{_sbindir}/rclvm2-cluster-activation
 ln -s service %{buildroot}%{_sbindir}/rclvm2-clvmd
 ln -s service %{buildroot}%{_sbindir}/rclvm2-cmirrord
+ln -s service %{buildroot}%{_sbindir}/rclvm2-lvmlockd
+ln -s service %{buildroot}%{_sbindir}/rclvm2-lvmlocking
 
 # remove files from lvm2 split due to systemd_generators picking them up
 rm %{buildroot}%{_unitdir}/blk-availability.service
@@ -200,6 +219,12 @@ rm %{buildroot}%{_unitdir}/dm-event.service
 rm %{buildroot}%{_unitdir}/dm-event.socket
 rm %{buildroot}%{_unitdir}/lvm2-monitor.service
 rm %{buildroot}%{_mandir}/man8/lvm2-activation-generator.8
+rm %{buildroot}%{_libexecdir}/systemd/system-generators/lvm2-activation-generator
+rm %{buildroot}%{_unitdir}/lvm2-lvmetad.service
+rm %{buildroot}%{_unitdir}/lvm2-lvmetad.socket
+rm %{buildroot}%{_unitdir}/lvm2-lvmpolld.service
+rm %{buildroot}%{_unitdir}/lvm2-lvmpolld.socket
+rm %{buildroot}%{_unitdir}/lvm2-pvscan@.service
 
 %files
 %defattr(-,root,root)
@@ -238,4 +263,42 @@ 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
+Requires:       libdlm >= %{dlm_version}
+Requires:       libsanlock1 >= %{sanlock_version}
+Requires:       lvm2 = %{version}
+%{?systemd_requires}
+
+%description -n lvm2-lockd
+LVM commands use lvmlockd to coordinate access to shared storage.
+
+%pre -n lvm2-lockd
+%service_add_pre lvm2-lvmlockd.service lvm2-lvmlocking.service
+
+%post -n lvm2-lockd
+%service_add_post lvm2-lvmlockd.service lvm2-lvmlocking.service
+
+%preun -n lvm2-lockd
+%service_del_preun lvm2-lvmlockd.service lvm2-lvmlocking.service
+
+%postun -n lvm2-lockd
+%service_del_postun lvm2-lvmlockd.service lvm2-lvmlocking.service
+
+%files -n lvm2-lockd
+%defattr(-,root,root,)
+%{_sbindir}/lvmlockd
+%{_sbindir}/lvmlockctl
+%{_mandir}/man8/lvmlockd.8%{ext_man}
+%{_mandir}/man8/lvmlockctl.8%{ext_man}
+%{_unitdir}/lvm2-lvmlockd.service
+%{_unitdir}/lvm2-lvmlocking.service
+%{_sbindir}/rclvm2-lvmlockd
+%{_sbindir}/rclvm2-lvmlocking
+
 %changelog

lvm2.changes

@@ -6,6 +6,12 @@ Mon Apr 10 10:41:02 UTC 2017 - tchvatal@suse.com
 - Enable internal cache
 - Enable lvmpolld
 
+-------------------------------------------------------------------
+Mon Apr 10 07:41:10 UTC 2017 - zren@suse.com
+
+- Add 'lvm2-lockd' subpackage, fate#323203 to lvm2-clvm to not pull
+  corosync and other deps to the core lvm2 package
+
 -------------------------------------------------------------------
 Fri Feb 24 10:57:16 UTC 2017 - zren@suse.com
 

lvm2.spec

@@ -463,7 +463,7 @@ popd
 %{_unitdir}/lvm2-pvscan@.service
 %{_unitdir}/lvm2-lvmpolld.socket
 %{_unitdir}/lvm2-lvmpolld.service
-%{_prefix}/lib/systemd/system-generators/lvm2-activation-generator
+%{_libexecdir}/systemd/system-generators/lvm2-activation-generator
 %dir %{_libdir}/device-mapper
 %{_libdir}/device-mapper/libdevmapper-event-lvm2*.so
 %{_libdir}/libdevmapper-event-lvm2*.so