pool/lvm2
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 495194 from home:ZRen:branches:Base:System

Browse Source 
- Fix compiling issue of lvmlockd, bsc#1037309
  + Makefile-skip-compliling-daemons-lvmlockd-directory.patch

- Fix compiling issue of lvmlockd, bsc#1037309
  + Makefile-skip-compliling-daemons-lvmlockd-directory.patch

- Fix compiling issue of lvmlockd, bsc#1037309
  + Makefile-skip-compliling-daemons-lvmlockd-directory.patch

OBS-URL: https://build.opensuse.org/request/show/495194
OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=185
This commit is contained in:
Eric ren 2017-05-16 09:02:24 +00:00 committed by Git OBS Bridge
parent d5825cbb3f
commit cea84c2670
5 changed files with 75 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Makefile-skip-compliling-daemons-lvmlockd-directory.patch Normal file
View File

@ -0,0 +1,47 @@
From f977d86dfea51a09eed1787071676e1d45a8f2f4 Mon Sep 17 00:00:00 2001
From: Eric Ren <zren@suse.com>
Date: Tue, 16 May 2017 15:26:54 +0800
Subject: [PATCH] build: skip compliling daemons/lvmlockd directory
bsc#1037309
Signed-off-by: Eric Ren <zren@suse.com>
---
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

6
device-mapper.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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 Fri May 5 11:33:28 UTC 2017 - tchvatal@suse.com

6
lvm2-clvm.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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 Fri May 5 11:33:28 UTC 2017 - tchvatal@suse.com

6
lvm2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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 Fri May 5 11:33:28 UTC 2017 - tchvatal@suse.com

10
lvm2.spec
View File

@ -110,6 +110,9 @@ Patch2011: lvm2-testsuite.patch
Patch2012: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch Patch2012: simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
### COMMON-PATCH-END ### ### COMMON-PATCH-END ###
#bsc#1037309
Patch2013: Makefile-skip-compliling-daemons-lvmlockd-directory.patch
%description %description
Programs and man pages for configuring and using the LVM2 Logical Programs and man pages for configuring and using the LVM2 Logical
Volume Manager. Volume Manager.
@ -146,6 +149,8 @@ Volume Manager.
%patch2012 -p1 %patch2012 -p1
### COMMON-PREP-END ### ### COMMON-PREP-END ###
%patch2013 -p1
%build %build
extra_opts=" extra_opts="
--enable-applib --enable-applib
@ -232,6 +237,11 @@ rm %{buildroot}%{_libdir}/libdevmapper.so
rm %{buildroot}%{_libdir}/libdevmapper-event.so rm %{buildroot}%{_libdir}/libdevmapper-event.so
rm %{buildroot}%{_includedir}/libdevmapper*.h rm %{buildroot}%{_includedir}/libdevmapper*.h
rm %{buildroot}%{_libdir}/pkgconfig/devmapper*.pc 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 # compat symlinks in /sbin remove with Leap 43
mkdir -p %{buildroot}/sbin mkdir -p %{buildroot}/sbin